Revision 3eaf0ec5 snf-tools/synnefo_tools/burnin/server_tests.py

b/snf-tools/synnefo_tools/burnin/server_tests.py
75 75
                'mode': stat.S_IRUSR | stat.S_IWUSR,
76 76
                'contents': base64.b64encode("This is a personality file")
77 77
            }]
78
        servername = "%s for %s" % (self.run_id, self.use_image['name'])
79 78
        self.use_flavor = random.choice(self.avail_flavors)
80 79

  
81 80
        self.server = self._create_server(
82
            servername, self.use_image, self.use_flavor, self.personality)
81
            self.use_image, self.use_flavor, self.personality)
83 82
        self.username = self._get_connection_username(self.server)
84 83
        self.password = self.server['adminPass']
85 84

  
......
118 117

  
119 118
    def test_005_server_becomes_active(self):
120 119
        """Test server becomes ACTIVE"""
121
        self._insist_on_server_transition(self.server, "BUILD", "ACTIVE")
120
        self._insist_on_server_transition(self.server, ["BUILD"], "ACTIVE")
122 121

  
123 122
    def test_006_get_server_oob_console(self):
124 123
        """Test getting OOB server console over VNC
......
189 188

  
190 189
    def test_012_server_becomes_stopped(self):
191 190
        """Test server becomes STOPPED"""
192
        self._insist_on_server_transition(self.server, "ACTIVE", "STOPPED")
191
        self._insist_on_server_transition(self.server, ["ACTIVE"], "STOPPED")
193 192

  
194 193
    def test_013_submit_start(self):
195 194
        """Test submit start server request"""
......
197 196

  
198 197
    def test_014_server_becomes_active(self):
199 198
        """Test server becomes ACTIVE again"""
200
        self._insist_on_server_transition(self.server, "STOPPED", "ACTIVE")
199
        self._insist_on_server_transition(self.server, ["STOPPED"], "ACTIVE")
201 200

  
202 201
    def test_015_server_ping_ipv4(self):
203 202
        """Test server OS is actually up and running again"""
......
262 261

  
263 262
    def test_022_server_becomes_deleted(self):
264 263
        """Test server becomes DELETED"""
265
        self._insist_on_server_transition(self.server, "ACTIVE", "DELETED")
264
        self._insist_on_server_transition(self.server, ["ACTIVE"], "DELETED")
266 265

  
267 266
    def test_023_server_no_longer(self):
268 267
        """Test server is no longer in server list"""
......
309 308
            self.avail_flavors = flavors
310 309
        else:
311 310
            self.avail_flavors = self._find_flavors(
312
                patterns=self.flavors, flavors=flavors)
311
                self.flavors, flavors=flavors)
313 312
        self.info("Found %s flavors to choose from", len(self.avail_flavors))
314 313

  
315 314
    def test_003_create_testsuites(self):

Also available in: Unified diff