Исправлены пути в тестах

mymedia2 · May 29, 2015 · 65014c5 · 65014c5
1 parent 492c7fa
commit 65014c5
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/tests/field_dict.py b/tests/field_dict.py
@@ -1,6 +1,8 @@
 #!/usr/bin/env python3
-from vkontakte import FieldDict
+
 import unittest
+from vk_cli.vkontakte import FieldDict
+
 class FieldDictTest(unittest.TestCase):
 	def test1(self):
 		fd = FieldDict.process_all({'a': 1, 'b': 2, 'c': "foo", 'd': "bar"})

diff --git a/tests/settings_test.py b/tests/settings_test.py
@@ -1,6 +1,8 @@
 #!/usr/bin/env python3
-from settings import Settings
+
 import unittest, sys, os
+from vk_cli.settings import Settings
+
 class SettingsTest(unittest.TestCase):
 	file_name = sys.argv[0]+".conf"
 	def test1(self):

diff --git a/tests/user_test.py b/tests/user_test.py
@@ -1,7 +1,10 @@
 #!/usr/bin/env python3
-from user import User, UserPack
-from settings import Settings
-import unittest, vkontakte
+
+import unittest, os
+from vk_cli import vkontakte
+from vk_cli.user import User, UserPack
+from vk_cli.settings import Settings
+
 APP_ID = 4755710
 MY_ID = 147603034
 
@@ -39,7 +42,7 @@ class UserPackTestNetwork(unittest.TestCase):
 	durov = User(1)
 	me = User(MY_ID)
 	def setUpClass():
-		settings = Settings("vk-cli.conf")
+		settings = Settings(os.path.expanduser(os.path.join("~", ".vk-cli.conf")))
 		vkontakte.api(APP_ID, access_token=settings.access_token)
 	def test1_generic(self):
 		both = UserPack((self.durov, self.me))

diff --git a/vk_cli/app.py b/vk_cli/app.py