Merged with the default branch.

1 files changed, 2 insertions, 48 deletions

diff --git a/test/test_static.py b/test/test_static.py
index b9c78fdd..9013b5c0 100644
--- a/test/test_static.py
+++ b/test/test_static.py
@@ -1,10 +1,7 @@
 import os
-import shutil
 import socket
 
 import pytest
-from conftest import unit_run
-from conftest import unit_stop
 from unit.applications.proto import TestApplicationProto
 from unit.option import option
 from unit.utils import waitforfiles
@@ -43,49 +40,6 @@ class TestStatic(TestApplicationProto):
             }
         )
 
-    def test_static_migration(self, skip_fds_check, temp_dir):
-        skip_fds_check(True, True, True)
-
-        def set_conf_version(path, version):
-            with open(path, 'w+') as f:
-                f.write(str(version))
-
-        with open(temp_dir + '/state/version', 'r') as f:
-            assert int(f.read().rstrip()) > 12500, 'current version'
-
-        assert 'success' in self.conf(
-            {"share": temp_dir + "/assets"}, 'routes/0/action'
-        ), 'configure migration 12500'
-
-        shutil.copytree(temp_dir + '/state', temp_dir + '/state_copy_12500')
-        set_conf_version(temp_dir + '/state_copy_12500/version', 12500)
-
-        assert 'success' in self.conf(
-            {"share": temp_dir + "/assets$uri"}, 'routes/0/action'
-        ), 'configure migration 12600'
-        shutil.copytree(temp_dir + '/state', temp_dir + '/state_copy_12600')
-        set_conf_version(temp_dir + '/state_copy_12600/version', 12600)
-
-        assert 'success' in self.conf(
-            {"share": temp_dir + "/assets"}, 'routes/0/action'
-        ), 'configure migration no version'
-        shutil.copytree(
-            temp_dir + '/state', temp_dir + '/state_copy_no_version'
-        )
-        os.remove(temp_dir + '/state_copy_no_version/version')
-
-        unit_stop()
-        unit_run(temp_dir + '/state_copy_12500')
-        assert self.get(url='/')['body'] == '0123456789', 'before 1.26.0'
-
-        unit_stop()
-        unit_run(temp_dir + '/state_copy_12600')
-        assert self.get(url='/')['body'] == '0123456789', 'after 1.26.0'
-
-        unit_stop()
-        unit_run(temp_dir + '/state_copy_no_version')
-        assert self.get(url='/')['body'] == '0123456789', 'before 1.26.0 2'
-
     def test_static_index(self):
         def set_index(index):
             assert 'success' in self.conf(
@@ -262,8 +216,8 @@ class TestStatic(TestApplicationProto):
         assert self.get(url='/../assets/')['status'] == 400, 'path invalid 5'
 
     def test_static_two_clients(self):
-        _, sock = self.get(url='/', start=True, no_recv=True)
-        _, sock2 = self.get(url='/', start=True, no_recv=True)
+        sock = self.get(no_recv=True)
+        sock2 = self.get(no_recv=True)
 
         assert sock.recv(1) == b'H', 'client 1'
         assert sock2.recv(1) == b'H', 'client 2'