From a8a2fd2e7d3184793104aead01f1ec0c46e1b46d Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 18 Sep 2015 20:08:31 +0200
Subject: [PATCH] Rename webserver.py to webserver_sub.py.

---
 scripts/dev/freeze_tests.py                          | 4 ++--
 tests/integration/conftest.py                        | 5 +++--
 tests/integration/{webserver.py => webserver_sub.py} | 0
 3 files changed, 5 insertions(+), 4 deletions(-)
 rename tests/integration/{webserver.py => webserver_sub.py} (100%)

diff --git a/scripts/dev/freeze_tests.py b/scripts/dev/freeze_tests.py
index e5160483f..eae600e71 100755
--- a/scripts/dev/freeze_tests.py
+++ b/scripts/dev/freeze_tests.py
@@ -73,8 +73,8 @@ def main():
         cx.setup(
             executables=[cx.Executable('scripts/dev/run_frozen_tests.py',
                                        targetName='run-frozen-tests'),
-                         cx.Executable('tests/integration/webserver.py',
-                                       targetName='webserver')],
+                         cx.Executable('tests/integration/webserver_sub.py',
+                                       targetName='webserver_sub')],
             options={'build_exe': get_build_exe_options()},
             **setupcommon.setupdata
         )
diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
index b8a33ea6a..917211835 100644
--- a/tests/integration/conftest.py
+++ b/tests/integration/conftest.py
@@ -127,11 +127,12 @@ class HTTPBin(QObject):
         """Start the webserver."""
         if hasattr(sys, 'frozen'):
             executable = os.path.join(os.path.dirname(sys.executable),
-                                      'webserver')
+                                      'webserver_sub')
             args = []
         else:
             executable = sys.executable
-            args = [os.path.join(os.path.dirname(__file__), 'webserver.py')]
+            args = [os.path.join(os.path.dirname(__file__),
+                                 'webserver_sub.py')]
 
         self.proc.start(executable, args + [str(self.port)])
         ok = self.proc.waitForStarted()
diff --git a/tests/integration/webserver.py b/tests/integration/webserver_sub.py
similarity index 100%
rename from tests/integration/webserver.py
rename to tests/integration/webserver_sub.py