From 6b20f5f6c063e4e6c94d719b607ad5a028b8beee Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Wed, 2 Jan 2013 18:11:31 +0100
Subject: new configManager for multi user configs

---
 tests/api/test_WebSocketAPI.py     | 33 ---------------------------------
 tests/api/test_WebSocketBackend.py | 33 +++++++++++++++++++++++++++++++++
 tests/api/test_noargs.py           |  2 +-
 3 files changed, 34 insertions(+), 34 deletions(-)
 delete mode 100644 tests/api/test_WebSocketAPI.py
 create mode 100644 tests/api/test_WebSocketBackend.py

(limited to 'tests/api')

diff --git a/tests/api/test_WebSocketAPI.py b/tests/api/test_WebSocketAPI.py
deleted file mode 100644
index ac22d044e..000000000
--- a/tests/api/test_WebSocketAPI.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from nose.tools import raises
-
-from module.remote.ttypes import Forbidden
-from module.remote.WSClient import WSClient
-
-class TestWebSocketAPI:
-
-    def setUp(self):
-        self.client = WSClient()
-        self.client.connect()
-
-    def tearDown(self):
-        self.client.close()
-
-    def test_login(self):
-        self.client.login("User", "test")
-        self.client.getServerVersion()
-        self.client.logout()
-
-    def test_wronglogin(self):
-        ret = self.client.login("WrongUser", "wrongpw")
-        assert ret == False
-
-    @raises(Forbidden)
-    def test_access(self):
-        self.client.getServerVersion()
-
-    @raises(AttributeError)
-    def test_unknown_method(self):
-        self.client.login("User", "test")
-        self.client.sdfdsg()
diff --git a/tests/api/test_WebSocketBackend.py b/tests/api/test_WebSocketBackend.py
new file mode 100644
index 000000000..be465e3d4
--- /dev/null
+++ b/tests/api/test_WebSocketBackend.py
@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+
+from nose.tools import raises
+
+from module.remote.ttypes import Forbidden
+from module.remote.WSClient import WSClient
+
+class TestWebSocketBackend:
+
+    def setUp(self):
+        self.client = WSClient()
+        self.client.connect()
+
+    def tearDown(self):
+        self.client.close()
+
+    def test_login(self):
+        self.client.login("User", "test")
+        self.client.getServerVersion()
+        self.client.logout()
+
+    def test_wronglogin(self):
+        ret = self.client.login("WrongUser", "wrongpw")
+        assert ret == False
+
+    @raises(Forbidden)
+    def test_access(self):
+        self.client.getServerVersion()
+
+    @raises(AttributeError)
+    def test_unknown_method(self):
+        self.client.login("User", "test")
+        self.client.sdfdsg()
diff --git a/tests/api/test_noargs.py b/tests/api/test_noargs.py
index 02e49cf13..aa010f293 100644
--- a/tests/api/test_noargs.py
+++ b/tests/api/test_noargs.py
@@ -6,7 +6,7 @@ from ApiTester import ApiTester
 
 from module.remote.ttypes import Iface
 
-IGNORE = ('kill', 'restart')
+IGNORE = ('stop', 'restart')
 
 class TestNoArgs(ApiTester):
     def setUp(self):
-- 
cgit v1.2.3