Skip to content
This repository has been archived by the owner on Feb 20, 2018. It is now read-only.

Commit

Permalink
fix_codestyle
Browse files Browse the repository at this point in the history
  • Loading branch information
Stanislav Zubov authored and Stanislav Zubov committed Jan 11, 2016
1 parent 552326a commit 525ef8e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions tests/unit/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import socket
import unittest

from nose.twistedtools import reactor
from mock import Mock, patch


Expand Down Expand Up @@ -225,10 +226,9 @@ def vmmaster_server_mock(port):
'core.sessions.SessionWorker', Mock()
):
from vmmaster.server import VMMasterServer
from nose.twistedtools import reactor
return VMMasterServer(reactor, port)


def request_mock(**kwargs):
time.sleep(2)
return Mock(status_code=200, headers={}, content=json.dumps({'status': 0}))
return Mock(status_code=200, headers={}, content=json.dumps({'status': 0}))
6 changes: 3 additions & 3 deletions vmmaster/api/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ def get_screenshots(session_id, log_step_id=None):
screenshots = []

if log_step_id:
session_steps = [current_app.database.get_step_by_id(log_step_id)]
steps = [current_app.database.get_step_by_id(log_step_id)]
else:
session_steps = current_app.database.get_log_steps_for_session(session_id)
steps = current_app.database.get_log_steps_for_session(session_id)

for log_step in session_steps:
for log_step in steps:
if log_step.screenshot:
screenshots.append(log_step.screenshot)

Expand Down

0 comments on commit 525ef8e

Please sign in to comment.