X-Git-Url: https://git.toastfreeware.priv.at/philipp/winterrodeln/wrfeed.git/blobdiff_plain/dc319354a83f1de78145e606cc051afe66665772..e2f3ee9e7d4ea1bc36133f004e8520815f332b78:/tests/test_wrfeed.py diff --git a/tests/test_wrfeed.py b/tests/test_wrfeed.py index aed5896..d4ccc5d 100644 --- a/tests/test_wrfeed.py +++ b/tests/test_wrfeed.py @@ -33,7 +33,8 @@ class TestDbWrfeed(WrfeedTestBase): # create database uri = make_url(wrfeed.app.config['SQLALCHEMY_DATABASE_URI']) self.uri = uri - uri_nodb = URL(uri.drivername, host=uri.host, port=uri.port, username=uri.username, password=uri.password, query=uri.query) + uri_nodb = URL(uri.drivername, host=uri.host, port=uri.port, username=uri.username, + password=uri.password, query=uri.query) engine_nodb = sqlalchemy.create_engine(uri_nodb) engine_nodb.execute("DROP DATABASE IF EXISTS {}".format(uri.database)) engine_nodb.execute("CREATE DATABASE {} CHARACTER SET = '{}'".format(uri.database, 'UTF8')) @@ -50,9 +51,14 @@ class TestDbWrfeed(WrfeedTestBase): # update dates seconds_diff, = con.execute("SELECT TIMESTAMPDIFF(SECOND, '2017-03-31 07:00', now())").fetchone() seconds_diff = int(seconds_diff) - con.execute("UPDATE wrreport SET date_report = DATE(date_report + INTERVAL %s SECOND) WHERE time_report IS NULL", (seconds_diff,)) - con.execute("UPDATE wrreport SET date_report = DATE(TIMESTAMP(date_report, time_report) + INTERVAL %s SECOND) WHERE time_report IS NOT NULL", (seconds_diff,)) - con.execute("UPDATE wrreport SET time_report = TIME(TIMESTAMP(date_report, time_report) + INTERVAL %s SECOND) WHERE time_report IS NOT NULL", (seconds_diff,)) + con.execute("UPDATE wrreport SET date_report = DATE(date_report + INTERVAL %s SECOND) " + "WHERE time_report IS NULL", (seconds_diff,)) + con.execute("UPDATE wrreport SET date_report = " + "DATE(TIMESTAMP(date_report, time_report) + INTERVAL %s SECOND) " + "WHERE time_report IS NOT NULL", (seconds_diff,)) + con.execute("UPDATE wrreport SET time_report = " + "TIME(TIMESTAMP(date_report, time_report) + INTERVAL %s SECOND) " + "WHERE time_report IS NOT NULL", (seconds_diff,)) con.execute("UPDATE wrreport SET date_entry = date_entry + INTERVAL %s SECOND", (seconds_diff,)) con.execute("UPDATE wrreport SET date_invalid = date_invalid + INTERVAL %s SECOND", (seconds_diff,)) con.execute("UPDATE wrreport SET delete_date = delete_date + INTERVAL %s SECOND", (seconds_diff,)) @@ -77,7 +83,8 @@ class TestDbWrfeed(WrfeedTestBase): self.assertTrue(result.data.startswith(b'