Revision d11c80c0 snf-tools/synnefo_tools/burnin/images_tests.py

b/snf-tools/synnefo_tools/burnin/images_tests.py
42 42

  
43 43
from kamaki.clients import ClientError
44 44

  
45
from synnefo_tools.burnin import common
45
from synnefo_tools.burnin.common import BurninTests, Proper
46 46

  
47 47

  
48 48
# Too many public methods. pylint: disable-msg=R0904
49
class FlavorsTestSuite(common.BurninTests):
49
class FlavorsTestSuite(BurninTests):
50 50
    """Test flavor lists for consistency"""
51
    simple_flavors = None
52
    detailed_flavors = None
53
    simple_names = None
51
    simple_flavors = Proper(value=None)
52
    detailed_flavors = Proper(value=None)
53
    simple_names = Proper(value=None)
54 54

  
55 55
    def test_001_simple_flavors(self):
56 56
        """Test flavor list actually returns flavors"""
57
        simple_flavors = self._get_list_of_flavors(detail=False)
58
        self._setattr("simple_flavors", simple_flavors)
57
        self.simple_flavors = self._get_list_of_flavors(detail=False)
59 58
        self.assertGreater(len(self.simple_flavors), 0)
60 59

  
61 60
    def test_002_get_detailed_flavors(self):
62 61
        """Test detailed flavor list is the same length as list"""
63
        detailed_flavors = self._get_list_of_flavors(detail=True)
64
        self._setattr("detailed_flavors", detailed_flavors)
62
        self.detailed_flavors = self._get_list_of_flavors(detail=True)
65 63
        self.assertEquals(len(self.simple_flavors), len(self.detailed_flavors))
66 64

  
67 65
    def test_003_same_flavor_names(self):
68 66
        """Test detailed and simple flavor list contain same names"""
69
        simple_names = sorted([flv['name'] for flv in self.simple_flavors])
70
        self._setattr("simple_names", simple_names)
67
        names = sorted([flv['name'] for flv in self.simple_flavors])
68
        self.simple_names = names
71 69
        detailed_names = sorted([flv['name'] for flv in self.detailed_flavors])
72
        self.assertEqual(simple_names, detailed_names)
70
        self.assertEqual(self.simple_names, detailed_names)
73 71

  
74 72
    def test_004_unique_flavor_names(self):
75 73
        """Test flavors have unique names"""
......
92 90

  
93 91
# --------------------------------------------------------------------
94 92
# Too many public methods. pylint: disable-msg=R0904
95
class ImagesTestSuite(common.BurninTests):
93
class ImagesTestSuite(BurninTests):
96 94
    """Test image lists for consistency"""
97
    simple_images = None
98
    detailed_images = None
99
    system_images = None
100
    temp_dir = None
101
    temp_image_name = None
102
    temp_image_file = None
95
    simple_images = Proper(value=None)
96
    detailed_images = Proper(value=None)
97
    system_images = Proper(value=None)
98
    temp_dir = Proper(value=None)
99
    temp_image_name = Proper(value=None)
100
    temp_image_file = Proper(value=None)
103 101

  
104 102
    def test_001_list_images(self):
105 103
        """Test simple image list actually returns images"""
106
        images = self._get_list_of_images(detail=False)
107
        self._setattr("simple_images", images)
108
        self.assertGreater(len(images), 0)
104
        self.simple_images = self._get_list_of_images(detail=False)
105
        self.assertGreater(len(self.simple_images), 0)
109 106

  
110 107
    def test_002_list_images_detailed(self):
111 108
        """Test detailed image list is the same length as simple list"""
112
        images = self._get_list_of_images(detail=True)
113
        self._setattr("detailed_images", images)
114
        self.assertEqual(len(self.simple_images), len(images))
109
        self.detailed_images = self._get_list_of_images(detail=True)
110
        self.assertEqual(len(self.simple_images), len(self.detailed_images))
115 111

  
116 112
    def test_003_same_image_names(self):
117 113
        """Test detailed and simple image list contain the same names"""
......
122 118
    def test_004_system_images(self):
123 119
        """Test that there are system images registered"""
124 120
        images = self._get_list_of_sys_images(images=self.detailed_images)
125
        self._setattr("system_images", images)
121
        self.system_images = images
126 122
        self.assertGreater(len(images), 0)
127 123

  
128 124
    def test_005_unique_image_names(self):
......
149 145
        self.info("Image's container is %s", image_container)
150 146
        image_name = image_location[3]
151 147
        self.info("Image's name is %s", image_name)
152
        self._setattr("temp_image_name", image_name)
148
        self.temp_image_name = image_name
153 149

  
154 150
        self._set_pithos_account(image_owner)
155 151
        self._set_pithos_container(image_container)
156 152

  
157 153
        # Create temp directory
158
        temp_dir = self._create_tmp_directory()
159
        self._setattr("temp_dir", temp_dir)
160
        self._setattr("temp_image_file",
161
                      os.path.join(self.temp_dir, self.temp_image_name))
154
        self.temp_dir = self._create_tmp_directory()
155
        self.temp_image_file = \
156
            os.path.join(self.temp_dir, self.temp_image_name)
162 157

  
163 158
        # Write to file
164 159
        self.info("Download image to %s", self.temp_image_file)
......
195 190
        # Remove uploaded image
196 191
        self.info("Deleting uploaded image %s", self.temp_image_name)
197 192
        self.clients.pithos.del_object(self.temp_image_name)
198
        self._setattr("temp_image_name", None)
193
        self.temp_image_name = None
199 194
        # Remove temp directory
200 195
        self.info("Deleting temp directory %s", self.temp_dir)
201 196
        self._remove_tmp_directory(self.temp_dir)
202
        self._setattr("temp_dir", None)
197
        self.temp_dir = None
203 198

  
204 199
    @classmethod
205 200
    def tearDownClass(cls):  # noqa

Also available in: Unified diff