Skip to content

Commit

Permalink
[test] bump requirements to match integrations repos. (#3195)
Browse files Browse the repository at this point in the history
* [test] bump requirements to match integrations repos.

* [test][kubeutil] reset kubutil names.

* [rabbitmq] never comes up. Bumping wait time.

* [rabbitmq][test] I think we've got multiple hits for find.
  • Loading branch information
truthbk committed Feb 15, 2017
1 parent 39b2b5d commit 3029873
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
8 changes: 4 additions & 4 deletions ci/rabbitmq.rb
Expand Up @@ -32,14 +32,14 @@ def rabbitmq_rootdir

task before_script: ['ci:common:before_script'] do
sh %(#{rabbitmq_rootdir}/sbin/rabbitmq-server -detached)
Wait.for 5672, 60
Wait.for 5672, 120
sh %(#{rabbitmq_rootdir}/sbin/rabbitmq-plugins enable rabbitmq_management)
sh %(#{rabbitmq_rootdir}/sbin/rabbitmq-plugins enable rabbitmq_management)
%w(test1 test5 tralala).each do |q|
sh %(python `find #{rabbitmq_rootdir} -name rabbitmqadmin` declare queue name=#{q})
sh %(python `find #{rabbitmq_rootdir} -name rabbitmqadmin` publish exchange=amq.default routing_key=#{q} payload="hello, world")
sh %(python `find #{rabbitmq_rootdir} -name rabbitmqadmin | head -n 1` declare queue name=#{q})
sh %(python `find #{rabbitmq_rootdir} -name rabbitmqadmin | head -n 1` publish exchange=amq.default routing_key=#{q} payload="hello, world")
end
sh %(python `find #{rabbitmq_rootdir} -name rabbitmqadmin` list queues)
sh %(python `find #{rabbitmq_rootdir} -name rabbitmqadmin | head -n 1` list queues)
end

task script: ['ci:common:script'] do
Expand Down
4 changes: 2 additions & 2 deletions requirements-test.txt
@@ -1,5 +1,5 @@
nose==1.3.4
flake8==2.5.1
mock==1.0.1
mock==2.0.0
pep8==1.5.7
pylint==1.5.5
pylint==1.6.4
2 changes: 2 additions & 0 deletions tests/checks/mock/test_kubernetes.py
Expand Up @@ -504,6 +504,8 @@ def test_retrieve_json_auth(self, r):

def test_get_node_info(self):
with mock.patch('utils.kubernetes.KubeUtil._fetch_host_data') as f:
self.kubeutil._node_ip = None
self.kubeutil._node_name = None
self.kubeutil.get_node_info()
f.assert_called_once()

Expand Down

0 comments on commit 3029873

Please sign in to comment.