[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [sysadmin/neon-openqa] /: fix encryption setup
From:       Harald Sitter <null () kde ! org>
Date:       2018-07-31 13:24:43
Message-ID: E1fkUdn-0003H0-LI () code ! kde ! org
[Download RAW message or body]

Git commit 369f59e5186b93764bd8baf0950a4da63d681fd3 by Harald Sitter.
Committed on 31/07/2018 at 13:24.
Pushed by sitter into branch 'master'.

fix encryption setup

- use proper line regexxing
- force unmounts of the user home as the pam is garbage and fails to do so
  A LOT

M  +1    -0    Environment_Variables.md
M  +8    -5    neon/tests/install/upgrade_bionic.pm

https://commits.kde.org/sysadmin/neon-openqa/369f59e5186b93764bd8baf0950a4d=
a63d681fd3

diff --git a/Environment_Variables.md b/Environment_Variables.md
index 2c51981..13d8fae 100644
--- a/Environment_Variables.md
+++ b/Environment_Variables.md
@@ -34,6 +34,7 @@ still fish them out of `ENV` I suppose).
 |OPENQA_SNAP_NAME|For snap testing this sets the application snap name. Th=
is is also the name that will be passed to `snap run`|
 |OPENQA_SNAP_CHANNEL|For snap testing this sets the store channel snaps ar=
e pulled from|
 |OPENQA_SNAP_RUNTIME_CHANNEL|For snap testing this sets the store channel =
the snap runtime (kde-frameworks-5) is pulled from. If this is not set OPEN=
QA_SNAP_CHANNEL will be used. If that isn't set either, the stable channel =
is used instead|
+|OPENQA_UPGRADE_ENCRYPT_HOME|Used in the upgrade_bionic test to enable hom=
e encryption|
 =

 # Test Suites
 =

diff --git a/neon/tests/install/upgrade_bionic.pm b/neon/tests/install/upgr=
ade_bionic.pm
index 413d251..d04c1ee 100644
--- a/neon/tests/install/upgrade_bionic.pm
+++ b/neon/tests/install/upgrade_bionic.pm
@@ -65,17 +65,20 @@ sub run {
             # for now.
             sleep 4;
 =

-            validate_script_output 'ls', sub { '' };
+            validate_script_output 'ls', sub { m/^$/ };
             assert_script_run 'touch marker';
-            validate_script_output 'ls', sub { m/marker/ };
+            validate_script_output 'ls', sub { m/^marker$/ };
 =

             script_run 'logout', 0;
             reset_consoles;
 =

             # Relogin by simply switching to the console again.
             select_console 'log-console';
-            # Cache sudo password.
-            assert_script_sudo 'ls';
+            # Cache sudo password & make sure the home is unmounted!
+            # https://wiki.ubuntu.com/EncryptedHomeFolder
+            #   Sometimes pam fails to unmount your folder (esp if use
+            #   graphical login), leaving it open even though your logged =
out.
+            script_sudo "umount /home/$encrypt_user";
             # ...and make sure the home is encrypted!
             validate_script_output "sudo ls /home/$encrypt_user",
                                    sub { m/Access-Your-Private-Data\.deskt=
op.*/ };
@@ -181,7 +184,7 @@ sub run {
             # for now.
             sleep 4;
 =

-            validate_script_output 'ls', sub { m/marker/ };
+            validate_script_output 'ls', sub { m/^marker$/ };
 =

             # And pop back to regular user.
             script_run 'logout', 0;
[prev in list] [next in list] [prev in thread] [next in thread]