More fixes for test failures (#109)

* Fix test_subscriber_attribute_filter() python test * Fix test_subscriber_attribute_filter() python test * Throw exceptions in ShouldBeErr retry blocks in ServiceTestClient.cpp * Add ctest retry in python build actions * Code formatting * Rework pipe tests * Improve test_subscriberfilter.py * Code formatting * dev * Fix service subscription attribute filter operation * Remove ctest repeat failed tests * Add retry to net tests that may have unexpected latency * Don't cause failure if no code to format in gitlab-ci.yml * Code formatting * Add retry to java tests that may have unexpected latency * Code formatting
robotraconteur · Jul 7, 2023 · 147712c · 147712c
1 parent a9d7570
commit 147712c
Show file tree

Hide file tree

Showing 9 changed files with 275 additions and 201 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -138,12 +138,12 @@ jobs:
       if: ${{ matrix.config.container == '' }}
       working-directory: build2
       run: |
-        ctest . -C Release --output-on-failure --repeat until-pass:3
+        ctest . -C Release --output-on-failure
     - name: test
       if: ${{ matrix.config.container != '' }}
       working-directory: build2
       run: |
-        ctest . -C Release -E "robotraconteur_test_discovery_loopback|RobotRaconteurService.DiscoveryLoopback" --output-on-failure --repeat until-pass:3
+        ctest . -C Release -E "robotraconteur_test_discovery_loopback|RobotRaconteurService.DiscoveryLoopback" --output-on-failure
     - name: python 3.7
       if: ${{ matrix.config.os == 'ubuntu-20.04' }}
       uses: ./robotraconteur/tools/actions/build_python_ver/linux
@@ -277,12 +277,12 @@ jobs:
       if: ${{ matrix.config.arch != 'x86' }}
       working-directory: build2
       run: |
-        ctest . -C Release --output-on-failure --repeat until-pass:3
+        ctest . -C Release --output-on-failure
     - name: test x86
       if: ${{ matrix.config.arch == 'x86' }}
       working-directory: build2
       run: |
-        ctest . -C Release --output-on-failure -E java --repeat until-pass:3
+        ctest . -C Release --output-on-failure -E java
     - name: python 3.6
       uses: ./robotraconteur/tools/actions/build_python_ver/win
       with:
@@ -377,7 +377,7 @@ jobs:
     - name: test
       working-directory: build2
       run: |
-        ctest . -C Release --output-on-failure --repeat until-pass:3
+        ctest . -C Release --output-on-failure
     - name: build artifacts
       if: failure()
       uses: actions/upload-artifact@v3
@@ -447,7 +447,7 @@ jobs:
     - name: test
       working-directory: build2
       run: |
-        ctest . -C Release --output-on-failure --repeat until-pass:3
+        ctest . -C Release --output-on-failure
     - name: python 3.7
       uses: ./robotraconteur/tools/actions/build_python_ver/osx
       with:
@@ -554,7 +554,7 @@ jobs:
     - name: test
       working-directory: build2
       run: |
-        ctest . -C Release --output-on-failure --repeat until-pass:3
+        ctest . -C Release --output-on-failure
     - name: matlab out tar
       run: >
          export RR_VER=`cat build2/rrversion.txt` 
@@ -608,7 +608,7 @@ jobs:
     - name: test
       working-directory: build2
       run: |
-        ctest . -C Release --output-on-failure --repeat until-pass:3
+        ctest . -C Release --output-on-failure
       shell: cmd /C call {0}
 
   build-conda-linux:
@@ -646,7 +646,7 @@ jobs:
     - name: test
       working-directory: build2
       run: |
-        ctest . -C Release --output-on-failure --repeat until-pass:3
+        ctest . -C Release --output-on-failure
 
   build-conda-osx:
     runs-on: macos-11
@@ -677,7 +677,7 @@ jobs:
     - name: test
       working-directory: build2
       run: |
-        ctest . -C Release --output-on-failure --repeat until-pass:3
+        ctest . -C Release --output-on-failure
   build-android:
 
     runs-on: ubuntu-22.04

diff --git a/.gitlab/ci/wasontech/.gitlab-ci.yml b/.gitlab/ci/wasontech/.gitlab-ci.yml
@@ -468,7 +468,7 @@ run_code_formatting:
   script:
     - export GIT_SSL_CAINFO="$CI_SERVER_TLS_CA_FILE"
     - ./tools/formatting/run-all-formatting
-    - git -c "user.name=John Wason" -c "user.email=wason@wasontech.com" commit -a -m "Code formatting"
+    - git diff-index --quiet HEAD || git -c "user.name=John Wason" -c "user.email=wason@wasontech.com" commit -a -m "Code formatting"
     - git push "https://code_formatting:$CODE_FORMATTING_TOKEN@$CI_SERVER_HOST:$CI_SERVER_PORT/$CI_PROJECT_PATH.git" HEAD:$CI_COMMIT_BRANCH
 
 build_raspbian_buster_armhf:

diff --git a/RobotRaconteurPython/RobotRaconteurPythonUtil.py b/RobotRaconteurPython/RobotRaconteurPythonUtil.py
@@ -4914,7 +4914,7 @@ def _SubscribeService_LoadFilter(node, filter_):
         if (filter_.Attributes is not None):
             for n, v in filter_.Attributes.items():
                 filter2.Attributes[n] = v
-        filter_.AttributesMatchOperation = filter_.AttributesMatchOperation
+        filter2.AttributesMatchOperation = filter_.AttributesMatchOperation
         if (filter_.Nodes is not None):
             nodes2 = RobotRaconteurPython.vectorptr_wrappedservicesubscriptionnode()
             for n1 in filter_.Nodes:

diff --git a/SWIG/RobotRaconteurWrapped.h b/SWIG/RobotRaconteurWrapped.h
@@ -1849,7 +1849,9 @@ class WrappedServiceSubscriptionFilter
     void SetRRPredicateDirector(WrappedServiceSubscriptionFilterPredicateDirector* director, int32_t id);
     uint32_t MaxConnections;
 
-    WrappedServiceSubscriptionFilter() : MaxConnections(0) {}
+    WrappedServiceSubscriptionFilter()
+        : MaxConnections(0), AttributesMatchOperation(ServiceSubscriptionFilterAttributeGroupOperation_AND)
+    {}
 };
 
 class WrappedServiceInfo2Subscription;

diff --git a/test/cpp/service/ServiceTestClient.cpp b/test/cpp/service/ServiceTestClient.cpp
@@ -2526,12 +2526,7 @@ void ServiceTestClient::TestPipes()
     ec4.disconnect();
 }
 
-void ServiceTestClient::ee1_cb(RR_SHARED_PTR<PipeEndpoint<RR_INTRUSIVE_PTR<RRArray<double> > > > p)
-{
-    if (p->Available() < 3)
-        return;
-    ee1.Set();
-}
+void ServiceTestClient::ee1_cb(RR_SHARED_PTR<PipeEndpoint<RR_INTRUSIVE_PTR<RRArray<double> > > > p) { ee1.Set(); }
 
 void ServiceTestClient::ee1_ack_cb(RR_SHARED_PTR<PipeEndpoint<RR_INTRUSIVE_PTR<RRArray<double> > > > p,
                                    uint32_t packetnum)
@@ -2540,19 +2535,9 @@ void ServiceTestClient::ee1_ack_cb(RR_SHARED_PTR<PipeEndpoint<RR_INTRUSIVE_PTR<R
         ack_recv = true;
 }
 
-void ServiceTestClient::ee2_cb(RR_SHARED_PTR<PipeEndpoint<RR_INTRUSIVE_PTR<RRArray<double> > > > p)
-{
-    if (p->Available() < 3)
-        return;
-    ee2.Set();
-}
+void ServiceTestClient::ee2_cb(RR_SHARED_PTR<PipeEndpoint<RR_INTRUSIVE_PTR<RRArray<double> > > > p) { ee2.Set(); }
 
-void ServiceTestClient::ee3_cb(RR_SHARED_PTR<PipeEndpoint<RR_INTRUSIVE_PTR<teststruct2> > > p)
-{
-    if (p->Available() < 2)
-        return;
-    ee3.Set();
-}
+void ServiceTestClient::ee3_cb(RR_SHARED_PTR<PipeEndpoint<RR_INTRUSIVE_PTR<teststruct2> > > p) { ee3.Set(); }
 
 void ServiceTestClient::TestWires()
 {
@@ -2623,8 +2608,11 @@ void ServiceTestClient::TestWires()
             boost::this_thread::sleep(boost::posix_time::milliseconds(5));
             RR_INTRUSIVE_PTR<RRArray<double> > in1;
             TimeSpec in1_time;
-            EXPECT_TRUE(w1->TryGetInValue(in1, in1_time));
-            EXPECT_RRARRAY_EQ(AttachRRArray(d3, 10, false), in1);
+            if (!w1->TryGetInValue(in1, in1_time))
+            {
+                throw std::runtime_error("TryGetInValue failed");
+            }
+            ca(AttachRRArray(d3, 10, false), in1);
         },
         1000);
 
@@ -2635,7 +2623,7 @@ void ServiceTestClient::TestWires()
             w2->SetOutValue(s2);
             boost::this_thread::sleep(boost::posix_time::milliseconds(5));
             RR_INTRUSIVE_PTR<teststruct2> in2 = w2->GetInValue();
-            EXPECT_RRARRAY_EQ(in2->mydat, AttachRRArray(d4, 10, false));
+            ca(in2->mydat, AttachRRArray(d4, 10, false));
         },
         500);
 
@@ -2646,8 +2634,8 @@ void ServiceTestClient::TestWires()
         {
             w3->SetOutValue(a2);
             RR_INTRUSIVE_PTR<RRMultiDimArray<int32_t> > in3 = w3->GetInValue();
-            EXPECT_RRARRAY_EQ(in3->Dims, AttachRRArray(i2, 2, false));
-            EXPECT_RRARRAY_EQ(in3->Array, AttachRRArray(i4, 10, false));
+            ca(in3->Dims, AttachRRArray(i2, 2, false));
+            ca(in3->Array, AttachRRArray(i4, 10, false));
         },
         500);