Imported Upstream version 1.17upstream/1.17

1 files changed, 6 insertions, 6 deletions

diff --git a/testenv/conf/server_files.py b/testenv/conf/server_files.py
index 1e9d346..eaa9cd0 100644
--- a/testenv/conf/server_files.py
+++ b/testenv/conf/server_files.py
@@ -3,7 +3,7 @@ from conf import hook
 """ Pre-Test Hook: ServerFiles
 This hook is used to define a set of files on the server's virtual filesystem.
 server_files is expected to be dictionary that maps filenames to their
-contents. In the future, this can be used to add additional metadat to the
+contents. In the future, this can be used to add additional metadata to the
 files using the WgetFile class too.
 
 This hook also does some additional processing on the contents of the file. Any
@@ -19,8 +19,8 @@ class ServerFiles:
 
     def __call__(self, test_obj):
         for server, files in zip(test_obj.servers, self.server_files):
-            rules = {f.name: test_obj.get_server_rules(f)
-                     for f in files}
-            files = {f.name: test_obj._replace_substring(f.content)
-                     for f in files}
-            server.server_conf(files, rules)
+            files_content = {f.name: test_obj._replace_substring(f.content)
+                             for f in files}
+            files_rules = {f.name: test_obj.get_server_rules(f)
+                           for f in files}
+            server.server_conf(files_content, files_rules)