diff --git a/needles/cockpit/logs_notices_entry-20160616.json b/needles/cockpit/logs_entry-20160616.json similarity index 78% rename from needles/cockpit/logs_notices_entry-20160616.json rename to needles/cockpit/logs_entry-20160616.json index 9bd967d3..5f3ec483 100644 --- a/needles/cockpit/logs_notices_entry-20160616.json +++ b/needles/cockpit/logs_entry-20160616.json @@ -1,6 +1,6 @@ { "tags": [ - "cockpit_logs_notices_entry" + "cockpit_logs_entry" ], "properties": [], "area": [ diff --git a/needles/cockpit/logs_notices_entry-20160616.png b/needles/cockpit/logs_entry-20160616.png similarity index 100% rename from needles/cockpit/logs_notices_entry-20160616.png rename to needles/cockpit/logs_entry-20160616.png diff --git a/needles/cockpit/logs_notices_entry-20160829.json b/needles/cockpit/logs_entry-20160829.json similarity index 78% rename from needles/cockpit/logs_notices_entry-20160829.json rename to needles/cockpit/logs_entry-20160829.json index 4802b559..640e2972 100644 --- a/needles/cockpit/logs_notices_entry-20160829.json +++ b/needles/cockpit/logs_entry-20160829.json @@ -1,6 +1,6 @@ { "tags": [ - "cockpit_logs_notices_entry" + "cockpit_logs_entry" ], "area": [ { diff --git a/needles/cockpit/logs_notices_entry-20160829.png b/needles/cockpit/logs_entry-20160829.png similarity index 100% rename from needles/cockpit/logs_notices_entry-20160829.png rename to needles/cockpit/logs_entry-20160829.png diff --git a/needles/cockpit/logs_entry-20170710.json b/needles/cockpit/logs_entry-20170710.json new file mode 100644 index 00000000..cf7a8605 --- /dev/null +++ b/needles/cockpit/logs_entry-20170710.json @@ -0,0 +1,15 @@ +{ + "area": [ + { + "height": 16, + "type": "match", + "width": 47, + "xpos": 783, + "ypos": 211 + } + ], + "properties": [], + "tags": [ + "cockpit_logs_entry" + ] +} \ No newline at end of file diff --git a/needles/cockpit/logs_entry-20170710.png b/needles/cockpit/logs_entry-20170710.png new file mode 100644 index 00000000..92752c2e Binary files /dev/null and b/needles/cockpit/logs_entry-20170710.png differ diff --git a/needles/cockpit/logs_notices_entry-f24-20170228.json b/needles/cockpit/logs_entry-f24-20170228.json similarity index 78% rename from needles/cockpit/logs_notices_entry-f24-20170228.json rename to needles/cockpit/logs_entry-f24-20170228.json index 63d98d14..6d2320fa 100644 --- a/needles/cockpit/logs_notices_entry-f24-20170228.json +++ b/needles/cockpit/logs_entry-f24-20170228.json @@ -1,6 +1,6 @@ { "tags": [ - "cockpit_logs_notices_entry" + "cockpit_logs_entry" ], "properties": [], "area": [ diff --git a/needles/cockpit/logs_notices_entry-f24-20170228.png b/needles/cockpit/logs_entry-f24-20170228.png similarity index 100% rename from needles/cockpit/logs_notices_entry-f24-20170228.png rename to needles/cockpit/logs_entry-f24-20170228.png diff --git a/needles/cockpit/logs_notices_entry.json b/needles/cockpit/logs_entry.json similarity index 78% rename from needles/cockpit/logs_notices_entry.json rename to needles/cockpit/logs_entry.json index 6bb3e0e7..4037ad4c 100644 --- a/needles/cockpit/logs_notices_entry.json +++ b/needles/cockpit/logs_entry.json @@ -1,6 +1,6 @@ { "tags": [ - "cockpit_logs_notices_entry" + "cockpit_logs_entry" ], "area": [ { diff --git a/needles/cockpit/logs_notices_entry.png b/needles/cockpit/logs_entry.png similarity index 100% rename from needles/cockpit/logs_notices_entry.png rename to needles/cockpit/logs_entry.png diff --git a/needles/cockpit/logs_notices_detail.json b/needles/cockpit/logs_entry_detail.json similarity index 77% rename from needles/cockpit/logs_notices_detail.json rename to needles/cockpit/logs_entry_detail.json index 308542db..ba88dfc9 100644 --- a/needles/cockpit/logs_notices_detail.json +++ b/needles/cockpit/logs_entry_detail.json @@ -1,7 +1,7 @@ { "properties": [], "tags": [ - "cockpit_logs_notices_detail" + "cockpit_logs_detail" ], "area": [ { @@ -12,4 +12,4 @@ "type": "match" } ] -} \ No newline at end of file +} diff --git a/needles/cockpit/logs_notices_detail.png b/needles/cockpit/logs_entry_detail.png similarity index 100% rename from needles/cockpit/logs_notices_detail.png rename to needles/cockpit/logs_entry_detail.png diff --git a/needles/cockpit/logs_severity-20170710.json b/needles/cockpit/logs_severity-20170710.json new file mode 100644 index 00000000..47f4e4e9 --- /dev/null +++ b/needles/cockpit/logs_severity-20170710.json @@ -0,0 +1,15 @@ +{ + "area": [ + { + "type": "match", + "width": 47, + "ypos": 116, + "height": 16, + "xpos": 338 + } + ], + "properties": [], + "tags": [ + "cockpit_logs_severity" + ] +} \ No newline at end of file diff --git a/needles/cockpit/logs_severity-20170710.png b/needles/cockpit/logs_severity-20170710.png new file mode 100644 index 00000000..92752c2e Binary files /dev/null and b/needles/cockpit/logs_severity-20170710.png differ diff --git a/needles/cockpit/logs_notices.json b/needles/cockpit/logs_severity.json similarity index 78% rename from needles/cockpit/logs_notices.json rename to needles/cockpit/logs_severity.json index bb14c7f4..d9bfa8ef 100644 --- a/needles/cockpit/logs_notices.json +++ b/needles/cockpit/logs_severity.json @@ -10,6 +10,6 @@ } ], "tags": [ - "cockpit_logs_notices" + "cockpit_logs_severity" ] -} \ No newline at end of file +} diff --git a/needles/cockpit/logs_notices.png b/needles/cockpit/logs_severity.png similarity index 100% rename from needles/cockpit/logs_notices.png rename to needles/cockpit/logs_severity.png diff --git a/tests/server_cockpit_basic.pm b/tests/server_cockpit_basic.pm index 08dd7f89..a7250578 100644 --- a/tests/server_cockpit_basic.pm +++ b/tests/server_cockpit_basic.pm @@ -11,12 +11,12 @@ sub run { assert_and_click "cockpit_logs"; # the date dropdown changes and messes with the button locations, so wait wait_still_screen 2; - assert_and_click "cockpit_logs_notices"; + assert_and_click "cockpit_logs_severity"; wait_still_screen 2; # assume there's an entry, click it - assert_and_click "cockpit_logs_notices_entry"; + assert_and_click "cockpit_logs_entry"; # check we get to the appropriate detail screen - assert_screen "cockpit_logs_notices_detail"; + assert_screen "cockpit_logs_detail"; # go to the services screen assert_and_click "cockpit_services"; wait_still_screen 2;