From 8dd75ed449905b8dd3f3d691070b151e96a3941f Mon Sep 17 00:00:00 2001
From: Przemyslaw Kaminski <pkaminski@mirantis.com>
Date: Tue, 9 Jun 2015 09:40:50 +0200
Subject: [PATCH] Redis: fix tests
---
jenkins-config.yaml | 3 +++
solar/solar/core/observer.py | 26 +++++++++++++-------------
2 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/jenkins-config.yaml b/jenkins-config.yaml
index e8c2adaf..e21e7446 100644
--- a/jenkins-config.yaml
+++ b/jenkins-config.yaml
@@ -1 +1,4 @@
clients-data-file: /tmp/connections.yaml
+
+file-system-db:
+ storage-path: /tmp/storage
diff --git a/solar/solar/core/observer.py b/solar/solar/core/observer.py
index 6de4ee61..39981f20 100644
--- a/solar/solar/core/observer.py
+++ b/solar/solar/core/observer.py
@@ -17,18 +17,18 @@ class BaseObserver(object):
self.attached_to = attached_to
self.name = name
self.value = value
- #self.receivers = []
+ self.receivers = []
- @property
- def receivers(self):
- from solar.core import resource
-
- signals.CLIENTS = signals.Connections.read_clients()
- for receiver_name, receiver_input in signals.Connections.receivers(
- self.attached_to.name,
- self.name
- ):
- yield resource.load(receiver_name).args[receiver_input]
+ # @property
+ # def receivers(self):
+ # from solar.core import resource
+ #
+ # signals.CLIENTS = signals.Connections.read_clients()
+ # for receiver_name, receiver_input in signals.Connections.receivers(
+ # self.attached_to.name,
+ # self.name
+ # ):
+ # yield resource.load(receiver_name).args[receiver_input]
def log(self, msg):
print '{} {}'.format(self, msg)
@@ -76,7 +76,7 @@ class BaseObserver(object):
if self.find_receiver(receiver):
self.log('No multiple subscriptions from {}'.format(receiver))
return
- #self.receivers.append(receiver)
+ self.receivers.append(receiver)
receiver.subscribed(self)
signals.Connections.add(
@@ -98,7 +98,7 @@ class BaseObserver(object):
"""
self.log('Unsubscribe {}'.format(receiver))
if self.find_receiver(receiver):
- #self.receivers.remove(receiver)
+ self.receivers.remove(receiver)
receiver.unsubscribed(self)
signals.Connections.remove(