Commit 422c6006 authored by Ignacio Corderi's avatar Ignacio Corderi
Browse files

Fixed test cases

parent dd878969

CHANGES.md

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ This section will document changes to the library since the last release 
- Added getVersion and getVersionAsync to the library.



## Bug Fixes

- Fixed tests not running and testcases with hardcoded 'localhost'

- Fixed flush operation build parameters (Merge #5, contributed by @rpcope1).

- AsyncClient returns NotConnected exception when an operation is attempted on a client before calling connect().

- Lowered default number of keys asked on ranges to 200 (ASKOVAD-287).

test/base.py

+4 −4
Original line number Diff line number Diff line
@@ -61,9 +61,9 @@ def _find_kinetic_jar(jar_path=None): 
        jar_path = os.path.abspath(

            os.path.join(

                os.path.dirname(__file__),

                # /src/main/python/test_kinetic

                '../../../../target',

                'Kinetic-0.2.0.1-SNAPSHOT-jar-with-dependencies.jar',

                # /kinetic-py/test/.

                '../../kinetic-java/kinetic-simulator/target/',

                'kinetic-simulator-0.6.0.3-SNAPSHOT-jar-with-dependencies.jar',

            )

        )

    if not os.path.exists(jar_path):
@@ -98,7 +98,7 @@ class BaseTestCase(unittest.TestCase): 


    If the .jar is not readily locatable you will get an error and need to

    ensure that the KINETIC_JAR environment variable points to the real

    path of Kinetic-1.0-SNAPSHOT-jar-with-dependencies.jar.

    path for kinetic-simulator.



    """

test/test_client.py

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ class KineticBasicTestCase(BaseTestCase): 


    def setUp(self):

        super(KineticBasicTestCase, self).setUp()

        self.client = Client("localhost", self.port)

        self.client = Client(self.host, self.port)



    def test_command_put(self):

        self.client.put(self.buildKey(0),"test_value")

test/test_cmd.py

+3 −3
Original line number Diff line number Diff line
@@ -32,8 +32,8 @@ class BaseCommandTestCase(BaseTestCase): 
    def setUp(self):

        super(BaseCommandTestCase, self).setUp()

        self.test_key = self.buildKey('test')

        self.client = client.Client("localhost", self.port)

        self.conn_args = '-H localhost -P %s ' % self.port

        self.client = client.Client(self.host, self.port)

        self.conn_args = '-H %s -P %s ' % (self.host, self.port)



    @contextlib.contextmanager

    def capture_stdout(self):
@@ -159,7 +159,7 @@ class TestCommand(BaseCommandTestCase): 
        # because the cmd output uses text/line based delimiters it's hard to

        # reason about keynames with a new line in them in this test

        bad_characters = [ord(c) for c in ('\n', '\r')]

        keys = [self.test_key + chr(ord_) for ord_ in range(256) if ord_ not

        keys = [self.test_key + chr(ord_) for ord_ in range(200) if ord_ not

                in bad_characters]

        for i, key in enumerate(keys):

            self.client.put(key, 'myvalue.%s' % i)

test/test_greenclient.py

+23 −20
Original line number Diff line number Diff line
@@ -36,13 +36,11 @@ else: 


from base import BaseTestCase, MultiSimulatorTestCase





@unittest.skip("It's blocking")

@unittest.skipIf(not eventlet_available, 'eventlet is not installed')

class TestGreenClient(BaseTestCase):



    def test_connect(self):

        c = greenclient.GreenClient('localhost', self.port)

        c = greenclient.GreenClient(self.host, self.port)

        c.connect()

        c.close()
@@ -58,10 +56,16 @@ class TestGreenClient(BaseTestCase): 
            def close(mock, *args, **kwargs):

                pass



            def settimeout(mock, *args, **kwargs):

                pass



            def shutdown(mock, *args, **kwargs):

                pass



        orig_socket = baseclient.socket

        try:

            baseclient.socket = MockSocket()

            c = greenclient.GreenClient('localhost', self.port + 10000)

            c = greenclient.GreenClient(self.host, self.port + 10000)

            self.assertRaises(socket.error, c.connect)

        finally:

            baseclient.socket = orig_socket
@@ -70,7 +74,7 @@ class TestGreenClient(BaseTestCase): 
        self.assertFalse(c.isConnected)



    def test_put(self):

        c = greenclient.GreenClient('localhost', self.port)

        c = greenclient.GreenClient(self.host, self.port)

        k = self.buildKey('test')

        with c:

            resp = c.put(k, 'value')
@@ -78,7 +82,7 @@ class TestGreenClient(BaseTestCase): 
            self.assertEquals(resp, True)



    def test_put_force(self):

        c = greenclient.GreenClient('localhost', self.port)

        c = greenclient.GreenClient(self.host, self.port)

        k = self.buildKey('test')

        with c:

            resp = c.put(k, 'value1', new_version='1')
@@ -93,7 +97,7 @@ class TestGreenClient(BaseTestCase): 
            self.assertEquals(resp.wait().value, 'value_force')



    def test_get_not_found(self):

        c = greenclient.GreenClient('localhost', self.port)

        c = greenclient.GreenClient(self.host, self.port)

        k = self.buildKey('test')

        with c:

            resp = c.get(k)
@@ -101,7 +105,7 @@ class TestGreenClient(BaseTestCase): 
            self.assert_(resp is None)



    def test_set_and_fetch(self):

        c = greenclient.GreenClient('localhost', self.port)

        c = greenclient.GreenClient(self.host, self.port)

        k = self.buildKey('test')

        with c:

            resp = c.put(k, 'value')
@@ -112,7 +116,7 @@ class TestGreenClient(BaseTestCase): 
            self.assertEquals(resp.value, 'value')



    def test_submit_many(self):

        c = greenclient.GreenClient('localhost', self.port)

        c = greenclient.GreenClient(self.host, self.port)

        keys = []

        for i in range(16):

            keys.append(self.buildKey(i))
@@ -135,7 +139,7 @@ class TestGreenClient(BaseTestCase): 
                self.assertEquals(resp.wait().value, 'value-%s' % k)



    def test_put_entries(self):

        c = greenclient.GreenClient('localhost', self.port)

        c = greenclient.GreenClient(self.host, self.port)

        with c:

            entries = []

            for i in range(3):
@@ -146,7 +150,7 @@ class TestGreenClient(BaseTestCase): 
                                  'value%s' % i)



    def test_get_keys(self):

        c = greenclient.GreenClient('localhost', self.port)

        c = greenclient.GreenClient(self.host, self.port)

        with c:

            keys = []

            resps = []
@@ -159,7 +163,7 @@ class TestGreenClient(BaseTestCase): 
                self.assertEquals(resp.value, 'value%s' % i)



    def test_delete_keys(self):

        c = greenclient.GreenClient('localhost', self.port)

        c = greenclient.GreenClient(self.host, self.port)

        with c:

            keys = []

            resps = []
@@ -173,7 +177,7 @@ class TestGreenClient(BaseTestCase): 
                self.assert_(c.get(key).wait() is None)



    def test_get_previous(self):

        c = greenclient.GreenClient('localhost', self.port)

        c = greenclient.GreenClient(self.host, self.port)

        with c:

            keys = []

            for i in range(3):
@@ -190,12 +194,12 @@ class TestGreenClient(BaseTestCase): 
    def test_get_empty_key_range(self):

        start_key = self.buildKey('\x00')

        end_key = self.buildKey('\xff')

        c = greenclient.GreenClient('localhost', self.port)

        c = greenclient.GreenClient(self.host, self.port)

        with c:

            self.assertEquals([], c.getKeyRange(start_key, end_key).wait())



    def test_get_key_range(self):

        c = greenclient.GreenClient('localhost', self.port)

        c = greenclient.GreenClient(self.host, self.port)

        with c:

            keys = []

            for i in range(3):
@@ -208,7 +212,7 @@ class TestGreenClient(BaseTestCase): 
        self.assertEquals(key_list, keys)



    def test_flush_on_close(self):

        c = greenclient.GreenClient('localhost', self.port)

        c = greenclient.GreenClient(self.host, self.port)

        with c:

            keys = []

            for i in range(3):
@@ -284,7 +288,7 @@ class TestGreenGets(BaseGreenTestCase): 
                values.add(value)

            self.c.wait()

            g = self.c.get_keys(keys, depth=8)

            resp_values = set([entry.value for entry in g])

            resp_values = set([str(entry.value) for entry in g])

        for value in values:

            self.assert_(value in resp_values)

        self.assertEquals(num_keys, len(resp_values))
@@ -302,7 +306,7 @@ class TestGreenGets(BaseGreenTestCase): 
                values.add(value)

            self.c.wait()

            g = self.c.get_keys(keys, depth=5)

            resp_values = set([entry.value for entry in g])

            resp_values = set([str(entry.value) for entry in g])

        for value in values:

            self.assert_(value in resp_values)

        self.assertEquals(num_keys, len(resp_values))
@@ -389,7 +393,7 @@ class TestGreenPuts(BaseGreenTestCase): 
                resp = self.c.get(entry.key).wait()

                self.assertEquals(resp.value, entry.value)



@unittest.skip("It's blocking")



class TestGreenDeletes(BaseGreenTestCase):



    def test_single_key(self):
@@ -478,7 +482,6 @@ class TestGreenDeletes(BaseGreenTestCase): 
                self.assertEquals(None, self.c.get(key).wait())





@unittest.skip("It's blocking")

@unittest.skipIf(not eventlet_available, 'eventlet is not installed')

class GreenClientPushKeysTestCase(MultiSimulatorTestCase):