Keep test path config when restoring environment in tests

This fixes `test_toy_multi_deps` which restores the environment in the
middle of the test and then misses the --sourcepath modification done at test setup.

test/framework/utilities.py

@@ -106,9 +106,6 @@ def setUp(self):
         os.close(fd)
         self.cwd = os.getcwd()
 
-        # keep track of original environment to restore
-        self.orig_environ = copy.deepcopy(os.environ)
-
         # keep track of original environment/Python search path to restore
         self.orig_sys_path = sys.path[:]
 
@@ -125,6 +122,10 @@ def setUp(self):
         # make sure that the tests only pick up easyconfigs provided with the tests
         os.environ['EASYBUILD_ROBOT_PATHS'] = os.path.join(testdir, 'easyconfigs', 'test_ecs')
 
+        # keep track of original environment to restore
+        # Do this AFTER setting the above paths to keep those when restoring
+        self.orig_environ = copy.deepcopy(os.environ)
+
         # make sure that the EasyBuild installation is still known even if we purge an EB module
         if os.getenv('EB_SCRIPT_PATH') is None:
             eb_path = which('eb')