You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2015/02/05 04:34:44 UTC
[3/4] stratos git commit: DEBUG log level by default to allow for
unit tests Enabled unit tests for util methods
DEBUG log level by default to allow for unit tests
Enabled unit tests for util methods
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c7d3aea6
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c7d3aea6
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c7d3aea6
Branch: refs/heads/master
Commit: c7d3aea65bb466eee68c927a25f39ca4bbeab488
Parents: 85d564f
Author: Chamila de Alwis <ch...@wso2.com>
Authored: Wed Feb 4 01:41:06 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu Feb 5 09:04:38 2015 +0530
----------------------------------------------------------------------
.../cartridgeagent/cartridgeagent/logging.ini | 4 +-
.../cartridgeagent/tests/test_events.py | 4 +-
.../cartridgeagent/tests/test_util.py | 130 +++++++++----------
3 files changed, 65 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/c7d3aea6/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/logging.ini
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/logging.ini b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/logging.ini
index d71b541..15cad9b 100644
--- a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/logging.ini
+++ b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/logging.ini
@@ -33,7 +33,7 @@ args=tuple()
[handler_log_file]
class=logging.FileHandler
-level=LOG_LEVEL
+level=DEBUG
formatter=default
args=("agent.log", "w")
@@ -47,6 +47,6 @@ args=("error.log", "w")
keys=root
[logger_root]
-level=LOG_LEVEL
+level=DEBUG
formatter=default
handlers=console,error_file,log_file
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/c7d3aea6/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/tests/test_events.py
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/tests/test_events.py b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/tests/test_events.py
index f2c14ba..ae4021c 100644
--- a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/tests/test_events.py
+++ b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/tests/test_events.py
@@ -122,6 +122,4 @@ def test_complete_topology_event():
assert member.status == "Initialized",\
"Member object not serialized properly. [status] %s " % member.status
assert member.lb_cluster_id is None,\
- "Member object not serialized properly. [lbClusterId] %s " % member.lb_cluster_id
-
-def
\ No newline at end of file
+ "Member object not serialized properly. [lbClusterId] %s " % member.lb_cluster_id
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/c7d3aea6/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/tests/test_util.py
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/tests/test_util.py b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/tests/test_util.py
index d1e026e..ff6a6fe 100644
--- a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/tests/test_util.py
+++ b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/tests/test_util.py
@@ -15,12 +15,12 @@
# specific language governing permissions and limitations
# under the License.
-# from ..cartridgeagent.modules.util.asyncscheduledtask import *
-# from ..cartridgeagent.modules.util import cartridgeagentutils
-# import time
-# import socket
-# from threading import Thread
-#
+from ..cartridgeagent.modules.util.asyncscheduledtask import *
+from ..cartridgeagent.modules.util import cartridgeagentutils
+import time
+import socket
+from threading import Thread
+
# ASYNC_WRITE_FILE = "asynctest.txt"
@@ -57,30 +57,24 @@
# f.seek(0)
# f.truncate()
# f.write("%1.4f" % (time.time()*1000))
-#
-#
-# def test_decrypt_password_success():
-# # def mockgetlog(path):
-# # return mocklog
-# #
-# # monkeypatch.delattr("LogFactory().get_log")
-# # TODO: enable logging in cartridgeagentutils
-#
-# plain_password = "plaintext"
-# secret_key = "tvnw63ufg9gh5111"
-# encrypted_password= "jP1lZ5xMlpLzu8MbY2Porg=="
-#
-# decrypted_password = cartridgeagentutils.decrypt_password(encrypted_password, secret_key)
-# #print decrypted_password
-#
-# assert decrypted_password == plain_password, "Password decryption failed"
-#
-#
-# def test_decrypt_password_failure():
-# plain_password = "plaintext"
-# secret_key = "notsecretkeyhere"
-# encrypted_password= "jP1lZ5xMlpLzu8MbY2Porg=="
-# assert cartridgeagentutils.decrypt_password(encrypted_password, secret_key) != plain_password, "Password decrypted for wrong key"
+
+
+def test_decrypt_password_success():
+ plain_password = "plaintext"
+ secret_key = "tvnw63ufg9gh5111"
+ encrypted_password= "jP1lZ5xMlpLzu8MbY2Porg=="
+
+ decrypted_password = cartridgeagentutils.decrypt_password(encrypted_password, secret_key)
+ #print decrypted_password
+
+ assert decrypted_password == plain_password, "Password decryption failed"
+
+
+def test_decrypt_password_failure():
+ plain_password = "plaintext"
+ secret_key = "notsecretkeyhere"
+ encrypted_password= "jP1lZ5xMlpLzu8MbY2Porg=="
+ assert cartridgeagentutils.decrypt_password(encrypted_password, secret_key) != plain_password, "Password decrypted for wrong key"
#
#
# def test_create_dir_normal():
@@ -93,41 +87,41 @@
#
# def test_create_dir_existing_dir():
# assert True
-#
-#
-# def test_wait_for_ports_activity_normal():
-# portnumber = 12345
-# listener = PortListener(portnumber)
-# listener.start()
-#
-# assert cartridgeagentutils.check_ports_active(socket.gethostbyname(socket.gethostname()), [str(portnumber)])
-#
-#
-# class PortListener(Thread):
-#
-# def __init__(self, portnumber):
-# Thread.__init__(self)
-# self.portnumber = portnumber
-# self.terminated = False
-#
-# def run(self):
-# s = socket.socket()
-# host = socket.gethostname()
-#
-# s.bind((host, self.portnumber))
-# s.listen(5)
-#
-# #while not self.terminated:
-# c, addr = s.accept() # Establish connection with client.
-# #print 'Got connection from', addr
-# c.send('Thank you for connecting')
-# c.close()
-#
-# s.close()
-#
-# def terminate(self):
-# self.terminated = True
-#
-#
-# def test_wait_for_ports_activity_non_existent():
-# assert cartridgeagentutils.check_ports_active(socket.gethostbyname(socket.gethostname()), [str(34565)]) == False
+
+
+def test_wait_for_ports_activity_normal():
+ portnumber = 12345
+ listener = PortListener(portnumber)
+ listener.start()
+
+ assert cartridgeagentutils.check_ports_active(socket.gethostbyname(socket.gethostname()), [str(portnumber)])
+
+
+def test_wait_for_ports_activity_non_existent():
+ assert cartridgeagentutils.check_ports_active(socket.gethostbyname(socket.gethostname()), [str(34565)]) == False
+
+
+class PortListener(Thread):
+
+ def __init__(self, portnumber):
+ Thread.__init__(self)
+ self.portnumber = portnumber
+ self.terminated = False
+
+ def run(self):
+ s = socket.socket()
+ host = socket.gethostname()
+
+ s.bind((host, self.portnumber))
+ s.listen(5)
+
+ # while not self.terminated:
+ c, addr = s.accept() # Establish connection with client.
+ # print 'Got connection from', addr
+ c.send('Thank you for connecting')
+ c.close()
+
+ s.close()
+
+ def terminate(self):
+ self.terminated = True
\ No newline at end of file