Reorganize main test line.

TyVik · Jan 7, 2018 · 0232995 · 0232995
1 parent b695f52
commit 0232995
Showing 1 changed file with 22 additions and 35 deletions.
diff --git a/YaDiskClient/test_yaDisk.py b/YaDiskClient/test_yaDisk.py
@@ -14,65 +14,52 @@
 
 
 class TestYaDisk(unittest.TestCase):
-    remote_folder = '/TestYaDisk_{}'.format(''.join(random.choice(string.ascii_uppercase) for _ in range(6)))
+    disk = None
+    remote_folder = None
     remote_file = None
     remote_path = None
-    tmp_remote_path = None
-    tmp_local_file = None
-    disk = None
 
     @classmethod
     def setUpClass(cls):
         cls.disk = YaDisk(LOGIN, PASSWORD)
-
         # take any file in work directory
         for item in os.listdir('.'):
             if os.path.isfile(item):
                 cls.remote_file = item
                 break
 
+        cls.remote_folder = '/TestYaDisk_{}'.format(''.join(random.choice(string.ascii_uppercase) for _ in range(6)))
         cls.remote_path = "{folder}/{file}".format(folder=cls.remote_folder, file=cls.remote_file)
-        cls.tmp_remote_path = "{path}~".format(path=cls.remote_path)
-        cls.tmp_local_file = "{file}~".format(file=cls.remote_file)
-
-    def test_1df(self):
-        result = self.disk.df()
-        self.assertIsInstance(result, dict)
-        self.assertTrue('available' in result.keys())
-        self.assertTrue('used' in result.keys())
 
-    def test_2mkdir(self):
-        self.disk.mkdir(self.remote_folder)
+    def test_00main(self):
+        def mkdir(remote_folder):
+            self.disk.mkdir(remote_folder)
 
-        try:
-            self.disk.mkdir('{folder}/dir/bad'.format(folder=self.remote_folder))
-        except YaDiskException as e:
-            self.assertEqual(e.code, 409)
+            try:
+                self.disk.mkdir('{folder}/dir/bad'.format(folder=remote_folder))
+            except YaDiskException as e:
+                self.assertEqual(e.code, 409)
 
-        try:
-            self.disk.mkdir(self.remote_folder)
-        except YaDiskException as e:
-            self.assertEqual(e.code, 405)
+            try:
+                self.disk.mkdir(remote_folder)
+            except YaDiskException as e:
+                self.assertEqual(e.code, 405)
 
-    def test_3upload(self):
+        tmp_remote_path = "{path}~".format(path=self.remote_path)
+        tmp_local_file = "{file}~".format(file=self.remote_file)
+
+        mkdir(self.remote_folder)
         self.disk.upload(self.remote_file, self.remote_path)
+        self.disk.mv(self.remote_path, tmp_remote_path)
+        self.disk.cp(tmp_remote_path, self.remote_path)
 
-    def test_4mv(self):
-        self.disk.mv(self.remote_path , self.tmp_remote_path)
-
-    def test_5cp(self):
-        self.disk.cp(self.tmp_remote_path  , self.remote_path)
-
-    def test_6ls(self):
         ls = self.disk.ls(self.remote_folder)
         self.assertEqual(len(ls), 3)
         self.assertEqual(ls[2]['length'], ls[1]['length'])
 
-    def test_7download(self):
-        self.disk.download(self.remote_path, self.tmp_local_file)
-
-    def test_8rm(self):
+        self.disk.download(self.remote_path, tmp_local_file)
         self.disk.rm(self.remote_folder)
+        os.remove(tmp_local_file)
 
     @classmethod
     def tearDownClass(cls):