Hi Dave,
On Wed, Mar 7, 2018 at 7:34 PM, Dave Page <dp...@pgadmin.org> wrote:
> Khushboo, can you look at this ASAP please? It passed tests on my machine,
> but Jenkins isn't happy.
>
> I have tried to reproduce the issue with many combination but couldn't
reproduce it.
With the help of logs, I have tried to fix it. Can you please check this
fix is helpful or not?
> Thanks.
>
> On Wed, Mar 7, 2018 at 2:01 PM, pgAdmin 4 Jenkins <jenk...@pgadmin.org>
> wrote:
>
>> See <https://jenkins.pgadmin.org/job/pgadmin4-master-python33/50
>> 7/display/redirect?page=changes>
>>
>> Changes:
>>
>> [Dave Page] Ensure all messages are retrieved from the server in the
>> Query Tool.
>>
>> ------------------------------------------
>> [...truncated 605.81 KB...]
>> PackageDeleteTestCase (Fetch Package Node URL)
>> ResourceGroupsPutTestCase (Put resource groups)
>> SynonymPutTestCase (Fetch synonym Node URL)
>> PackageAddTestCase (Fetch Package Node URL)
>> PackageGetTestCase (Fetch Package Node URL)
>> ResourceGroupsAddTestCase (Add resource groups)
>> SynonymDeleteTestCase (Fetch synonym Node URL)
>> ResourceGroupsGetTestCase (Get resource groups)
>> SynonymGetTestCase (Fetch synonym Node URL)
>> PackagePutTestCase (Fetch Package Node URL)
>> SynonymAddTestCase (Default Node URL)
>> ResourceGroupsDeleteTestCase (Delete resource groups)
>> TestSSLConnection (Test for SSL connection)
>>
>> EDB Postgres AS 9.3:
>>
>> 280 tests passed
>> 1 test failed:
>> TestPollQueryTool (When query tool polling returns
>> messages with result data-set)
>> 7 tests skipped:
>> ResourceGroupsDeleteTestCase (Delete resource groups)
>> ResourceGroupsPutTestCase (Put resource groups)
>> TableAddTestCase (Create Range partitioned table with 2
>> partitions,
>> Create List partitioned table
>> with 2 partitions)
>> ResourceGroupsAddTestCase (Add resource groups)
>> TestSSLConnection (Test for SSL connection)
>> ResourceGroupsGetTestCase (Get resource groups)
>> TableUpdateTestCase (Create partitions of existing list
>> partitioned table,
>> Detach partition from existing
>> list partitioned table,
>> Attach partition to existing list
>> partitioned table,
>> Attach partition to existing
>> range partitioned table,
>> Detach partition from existing
>> range partitioned table,
>> Create partitions of existing
>> range partitioned table)
>>
>> EDB Postgres AS 9.2:
>>
>> 272 tests passed
>> 1 test failed:
>> TestPollQueryTool (When query tool polling returns
>> messages with result data-set)
>> 15 tests skipped:
>> ResourceGroupsPutTestCase (Put resource groups)
>> EventTriggerGetTestCase (Fetch Event Trigger Node URL)
>> ViewsAddTestCase (Add materialized view under schema node)
>> ResourceGroupsAddTestCase (Add resource groups)
>> TestSSLConnection (Test for SSL connection)
>> EventTriggerAddTestCase (Fetch Event Trigger Node URL)
>> ResourceGroupsGetTestCase (Get resource groups)
>> TableUpdateTestCase (Create partitions of existing list
>> partitioned table,
>> Detach partition from existing
>> list partitioned table,
>> Attach partition to existing list
>> partitioned table,
>> Attach partition to existing
>> range partitioned table,
>> Detach partition from existing
>> range partitioned table,
>> Create partitions of existing
>> range partitioned table)
>> EventTriggerDeleteTestCase (Fetch Event Trigger Node URL)
>> EventTriggerPutTestCase (Fetch Event Trigger Node URL)
>> ViewsUpdateTestCase (Update materialized view under
>> schema node)
>> TableAddTestCase (Create Range partitioned table with 2
>> partitions,
>> Create List partitioned table
>> with 2 partitions)
>> ViewsDeleteTestCase (Delete materialized view under
>> schema node)
>> ViewsGetTestCase (Get materialized view under schema node)
>> ResourceGroupsDeleteTestCase (Delete resource groups)
>>
>> PostgreSQL 9.2:
>>
>> 265 tests passed
>> 0 tests failed
>> 23 tests skipped:
>> PackageDeleteTestCase (Fetch Package Node URL)
>> SynonymPutTestCase (Fetch synonym Node URL)
>> ViewsGetTestCase (Get materialized view under schema node)
>> SynonymDeleteTestCase (Fetch synonym Node URL)
>> ResourceGroupsAddTestCase (Add resource groups)
>> ViewsAddTestCase (Add materialized view under schema node)
>> EventTriggerAddTestCase (Fetch Event Trigger Node URL)
>> EventTriggerDeleteTestCase (Fetch Event Trigger Node URL)
>> EventTriggerPutTestCase (Fetch Event Trigger Node URL)
>> PackagePutTestCase (Fetch Package Node URL)
>> SynonymAddTestCase (Default Node URL)
>> TestSSLConnection (Test for SSL connection)
>> ResourceGroupsPutTestCase (Put resource groups)
>> EventTriggerGetTestCase (Fetch Event Trigger Node URL)
>> PackageGetTestCase (Fetch Package Node URL)
>> PackageAddTestCase (Fetch Package Node URL)
>> ResourceGroupsGetTestCase (Get resource groups)
>> TableUpdateTestCase (Create partitions of existing list
>> partitioned table,
>> Detach partition from existing
>> list partitioned table,
>> Attach partition to existing list
>> partitioned table,
>> Attach partition to existing
>> range partitioned table,
>> Detach partition from existing
>> range partitioned table,
>> Create partitions of existing
>> range partitioned table)
>> SynonymGetTestCase (Fetch synonym Node URL)
>> ViewsUpdateTestCase (Update materialized view under
>> schema node)
>> TableAddTestCase (Create Range partitioned table with 2
>> partitions,
>> Create List partitioned table
>> with 2 partitions)
>> ViewsDeleteTestCase (Delete materialized view under
>> schema node)
>> ResourceGroupsDeleteTestCase (Delete resource groups)
>>
>> PostgreSQL 9.3:
>>
>> 272 tests passed
>> 1 test failed:
>> TestPollQueryTool (When query tool polling returns
>> messages with result data-set)
>> 15 tests skipped:
>> PackageDeleteTestCase (Fetch Package Node URL)
>> ResourceGroupsPutTestCase (Put resource groups)
>> SynonymPutTestCase (Fetch synonym Node URL)
>> PackageAddTestCase (Fetch Package Node URL)
>> PackageGetTestCase (Fetch Package Node URL)
>> ResourceGroupsAddTestCase (Add resource groups)
>> SynonymDeleteTestCase (Fetch synonym Node URL)
>> ResourceGroupsGetTestCase (Get resource groups)
>> TableUpdateTestCase (Create partitions of existing list
>> partitioned table,
>> Detach partition from existing
>> list partitioned table,
>> Attach partition to existing list
>> partitioned table,
>> Attach partition to existing
>> range partitioned table,
>> Detach partition from existing
>> range partitioned table,
>> Create partitions of existing
>> range partitioned table)
>> SynonymGetTestCase (Fetch synonym Node URL)
>> PackagePutTestCase (Fetch Package Node URL)
>> TableAddTestCase (Create Range partitioned table with 2
>> partitions,
>> Create List partitioned table
>> with 2 partitions)
>> SynonymAddTestCase (Default Node URL)
>> ResourceGroupsDeleteTestCase (Delete resource groups)
>> TestSSLConnection (Test for SSL connection)
>>
>> PostgreSQL 9.4:
>>
>> 272 tests passed
>> 1 test failed:
>> TestPollQueryTool (When query tool polling returns
>> messages with result data-set)
>> 15 tests skipped:
>> PackageDeleteTestCase (Fetch Package Node URL)
>> ResourceGroupsPutTestCase (Put resource groups)
>> SynonymPutTestCase (Fetch synonym Node URL)
>> PackageAddTestCase (Fetch Package Node URL)
>> PackageGetTestCase (Fetch Package Node URL)
>> ResourceGroupsAddTestCase (Add resource groups)
>> SynonymDeleteTestCase (Fetch synonym Node URL)
>> ResourceGroupsGetTestCase (Get resource groups)
>> TableUpdateTestCase (Create partitions of existing list
>> partitioned table,
>> Detach partition from existing
>> list partitioned table,
>> Attach partition to existing list
>> partitioned table,
>> Attach partition to existing
>> range partitioned table,
>> Detach partition from existing
>> range partitioned table,
>> Create partitions of existing
>> range partitioned table)
>> SynonymGetTestCase (Fetch synonym Node URL)
>> PackagePutTestCase (Fetch Package Node URL)
>> TableAddTestCase (Create Range partitioned table with 2
>> partitions,
>> Create List partitioned table
>> with 2 partitions)
>> SynonymAddTestCase (Default Node URL)
>> ResourceGroupsDeleteTestCase (Delete resource groups)
>> TestSSLConnection (Test for SSL connection)
>>
>> PostgreSQL 9.5:
>>
>> 272 tests passed
>> 1 test failed:
>> TestPollQueryTool (When query tool polling returns
>> messages with result data-set)
>> 15 tests skipped:
>> PackageDeleteTestCase (Fetch Package Node URL)
>> ResourceGroupsPutTestCase (Put resource groups)
>> SynonymPutTestCase (Fetch synonym Node URL)
>> PackageAddTestCase (Fetch Package Node URL)
>> PackageGetTestCase (Fetch Package Node URL)
>> ResourceGroupsAddTestCase (Add resource groups)
>> SynonymDeleteTestCase (Fetch synonym Node URL)
>> ResourceGroupsGetTestCase (Get resource groups)
>> TableUpdateTestCase (Create partitions of existing list
>> partitioned table,
>> Detach partition from existing
>> list partitioned table,
>> Attach partition to existing list
>> partitioned table,
>> Attach partition to existing
>> range partitioned table,
>> Detach partition from existing
>> range partitioned table,
>> Create partitions of existing
>> range partitioned table)
>> SynonymGetTestCase (Fetch synonym Node URL)
>> PackagePutTestCase (Fetch Package Node URL)
>> TableAddTestCase (Create Range partitioned table with 2
>> partitions,
>> Create List partitioned table
>> with 2 partitions)
>> SynonymAddTestCase (Default Node URL)
>> ResourceGroupsDeleteTestCase (Delete resource groups)
>> TestSSLConnection (Test for SSL connection)
>> NOTE: Configuring authentication for DESKTOP mode.
>> pgAdmin 4 - Application Initialisation
>> ======================================
>>
>> Executing and polling with: 2 NOTICES WITH DATASET
>> Executing and polling with: 1000 NOTICES WITH DATASET
>> Executing and polling with: NO NOTICE WITH DATASET
>> Executing and polling with: 2 NOTICES WITH DATASET
>> Executing and polling with: 2 NOTICES WITH DATASET
>> Executing and polling with: 2 NOTICES WITH DATASET
>> Executing and polling with: 2 NOTICES WITH DATASET
>> Executing and polling with: 2 NOTICES WITH DATASET
>> Executing and polling with: 2 NOTICES WITH DATASET
>> Executing and polling with: 2 NOTICES WITH DATASET
>> Executing and polling with: 2 NOTICES WITH DATASET
>> Executing and polling with: 2 NOTICES WITH DATASET
>> Executing and polling with: 2 NOTICES WITH DATASET
>> Please check output in file: <https://jenkins.pgadmin.org/j
>> ob/pgadmin4-master-python33/ws/web/regression/regression.log>
>>
>>
>> PostgreSQL 9.6:
>>
>> 272 tests passed
>> 1 test failed:
>> TestPollQueryTool (When query tool polling returns
>> messages with result data-set)
>> 15 tests skipped:
>> PackageDeleteTestCase (Fetch Package Node URL)
>> ResourceGroupsPutTestCase (Put resource groups)
>> SynonymPutTestCase (Fetch synonym Node URL)
>> PackageAddTestCase (Fetch Package Node URL)
>> PackageGetTestCase (Fetch Package Node URL)
>> ResourceGroupsAddTestCase (Add resource groups)
>> SynonymDeleteTestCase (Fetch synonym Node URL)
>> ResourceGroupsGetTestCase (Get resource groups)
>> TableUpdateTestCase (Create partitions of existing list
>> partitioned table,
>> Detach partition from existing
>> list partitioned table,
>> Attach partition to existing list
>> partitioned table,
>> Attach partition to existing
>> range partitioned table,
>> Detach partition from existing
>> range partitioned table,
>> Create partitions of existing
>> range partitioned table)
>> SynonymGetTestCase (Fetch synonym Node URL)
>> PackagePutTestCase (Fetch Package Node URL)
>> TableAddTestCase (Create Range partitioned table with 2
>> partitions,
>> Create List partitioned table
>> with 2 partitions)
>> SynonymAddTestCase (Default Node URL)
>> ResourceGroupsDeleteTestCase (Delete resource groups)
>> TestSSLConnection (Test for SSL connection)
>>
>> EDB Postgres AS 9.4:
>>
>> 284 tests passed
>> 1 test failed:
>> TestPollQueryTool (When query tool polling returns
>> messages with result data-set)
>> 3 tests skipped:
>> TableAddTestCase (Create Range partitioned table with 2
>> partitions,
>> Create List partitioned table
>> with 2 partitions)
>> TestSSLConnection (Test for SSL connection)
>> TableUpdateTestCase (Create partitions of existing list
>> partitioned table,
>> Detach partition from existing
>> list partitioned table,
>> Attach partition to existing list
>> partitioned table,
>> Attach partition to existing
>> range partitioned table,
>> Detach partition from existing
>> range partitioned table,
>> Create partitions of existing
>> range partitioned table)
>>
>> ======================================================================
>>
>> ERROR: Error detected when running the Python tests.
>> ERROR: Error detected when running the Python tests.
>> Build step 'Execute shell' marked build as failure
>>
>
>
>
> --
> Dave Page
> Blog: http://pgsnake.blogspot.com
> Twitter: @pgsnake
>
> EnterpriseDB UK: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company
>
diff --git a/web/pgadmin/tools/sqleditor/tests/test_poll_query_tool.py b/web/pgadmin/tools/sqleditor/tests/test_poll_query_tool.py
index 275ed9c..d007e86 100644
--- a/web/pgadmin/tools/sqleditor/tests/test_poll_query_tool.py
+++ b/web/pgadmin/tools/sqleditor/tests/test_poll_query_tool.py
@@ -100,7 +100,7 @@ NOTICE: Hello, world!
response_data = json.loads(response.data.decode('utf-8'))
# Check the returned messages
- self.assertEquals(self.expected_message[cnt],
+ self.assertIn(self.expected_message[cnt],
response_data['data']['additional_messages'])
# Check the output
self.assertEquals(self.expected_result[cnt],
