fix test_run_shell_cmd_env after changes to env.sh to make unsetting of environment more robust

Author: boegel

test/framework/run.py

@@ -294,7 +294,8 @@ def test_run_shell_cmd_env(self):
         env_script = os.path.join(cmd_tmpdir, 'env.sh')
         self.assertExists(env_script)
         env_script_txt = read_file(env_script)
-        self.assertTrue(env_script_txt.startswith('unset -f $('))
+        self.assertIn('unset "$var"', env_script_txt)
+        self.assertIn('unset -f "$func"', env_script_txt)
         self.assertIn('\nexport FOOBAR=foobar\nexport PATH', env_script_txt)
 
         cmd_script = os.path.join(cmd_tmpdir, 'cmd.sh')