This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/develop by this push:
new f283dc2829 fix(plc4go/eip): Tried to make the code more robust to no
longer cause errors on Jenkins
f283dc2829 is described below
commit f283dc2829041ab16b6ae0c10db1c7aa983e638f
Author: christoferdutz <[email protected]>
AuthorDate: Wed Mar 8 08:41:26 2023 +0100
fix(plc4go/eip): Tried to make the code more robust to no longer cause
errors on Jenkins
---
.../protocols/bacnetip/readwrite/model/BACnetVendorId.go | 16 ++++++++++++++++
plc4go/spi/testutils/DriverTestRunner.go | 4 +++-
plc4go/tests/drivers/tests/eip_driver_test.go | 8 ++------
3 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go
b/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go
index 4f9ec3caff..b2e50be045 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go
@@ -1438,6 +1438,7 @@ const (
BACnetVendorId_TECHKNAVE
BACnetVendorId = 1407
BACnetVendorId_ELSNER_ELEKTRONIK
BACnetVendorId = 1408
BACnetVendorId_LEFOO_INDUSTRIAL_HANGZHOU_CO_LTD
BACnetVendorId = 1409
+ BACnetVendorId_CALIBRATION_TECHNOLOGIES_INC
BACnetVendorId = 1410
BACnetVendorId_UNKNOWN_VENDOR
BACnetVendorId = 0xFFFF
)
@@ -2847,6 +2848,7 @@ func init() {
BACnetVendorId_TECHKNAVE,
BACnetVendorId_ELSNER_ELEKTRONIK,
BACnetVendorId_LEFOO_INDUSTRIAL_HANGZHOU_CO_LTD,
+ BACnetVendorId_CALIBRATION_TECHNOLOGIES_INC,
BACnetVendorId_UNKNOWN_VENDOR,
}
}
@@ -4681,6 +4683,10 @@ func (e BACnetVendorId) VendorId() uint16 {
{ /* '141' */
return 141
}
+ case 1410:
+ { /* '1410' */
+ return 1410
+ }
case 142:
{ /* '142' */
return 142
@@ -10307,6 +10313,10 @@ func (e BACnetVendorId) VendorName() string {
{ /* '141' */
return "Yaskawa America, Inc."
}
+ case 1410:
+ { /* '1410' */
+ return "Calibration Technologies, Inc."
+ }
case 142:
{ /* '142' */
return "DEOS control systems GmbH"
@@ -15018,6 +15028,8 @@ func BACnetVendorIdByValue(value uint16) (enum
BACnetVendorId, ok bool) {
return BACnetVendorId_LEFOO_INDUSTRIAL_HANGZHOU_CO_LTD, true
case 141:
return BACnetVendorId_YASKAWA_AMERICA_INC, true
+ case 1410:
+ return BACnetVendorId_CALIBRATION_TECHNOLOGIES_INC, true
case 142:
return BACnetVendorId_DEO_SCONTROLSYSTEMS_GMBH, true
case 143:
@@ -17828,6 +17840,8 @@ func BACnetVendorIdByName(value string) (enum
BACnetVendorId, ok bool) {
return BACnetVendorId_LEFOO_INDUSTRIAL_HANGZHOU_CO_LTD, true
case "YASKAWA_AMERICA_INC":
return BACnetVendorId_YASKAWA_AMERICA_INC, true
+ case "CALIBRATION_TECHNOLOGIES_INC":
+ return BACnetVendorId_CALIBRATION_TECHNOLOGIES_INC, true
case "DEO_SCONTROLSYSTEMS_GMBH":
return BACnetVendorId_DEO_SCONTROLSYSTEMS_GMBH, true
case "DIGITALE_MESSUND_STEUERSYSTEMEAG":
@@ -20695,6 +20709,8 @@ func (e BACnetVendorId) PLC4XEnumName() string {
return "LEFOO_INDUSTRIAL_HANGZHOU_CO_LTD"
case BACnetVendorId_YASKAWA_AMERICA_INC:
return "YASKAWA_AMERICA_INC"
+ case BACnetVendorId_CALIBRATION_TECHNOLOGIES_INC:
+ return "CALIBRATION_TECHNOLOGIES_INC"
case BACnetVendorId_DEO_SCONTROLSYSTEMS_GMBH:
return "DEO_SCONTROLSYSTEMS_GMBH"
case BACnetVendorId_DIGITALE_MESSUND_STEUERSYSTEMEAG:
diff --git a/plc4go/spi/testutils/DriverTestRunner.go
b/plc4go/spi/testutils/DriverTestRunner.go
index 68d6ee844c..6e7969e433 100644
--- a/plc4go/spi/testutils/DriverTestRunner.go
+++ b/plc4go/spi/testutils/DriverTestRunner.go
@@ -116,7 +116,7 @@ func (m DriverTestsuite) Run(driverManager
plc4go.PlcDriverManager, testcase Tes
return errors.Wrap(err, "error in setup step
"+testStep.name)
}
// We sleep a bit to not run too fast into the post setup steps
and give connections a bit time to settle built up
- time.Sleep(2 * time.Millisecond)
+ time.Sleep(10 * time.Millisecond)
}
// Run the actual scenario steps
@@ -126,6 +126,7 @@ func (m DriverTestsuite) Run(driverManager
plc4go.PlcDriverManager, testcase Tes
if err != nil {
return errors.Wrap(err, "error in step "+testStep.name)
}
+ time.Sleep(10 * time.Millisecond)
}
// Run the teardown steps
@@ -135,6 +136,7 @@ func (m DriverTestsuite) Run(driverManager
plc4go.PlcDriverManager, testcase Tes
if err != nil {
return errors.Wrap(err, "error in teardown step
"+testStep.name)
}
+ time.Sleep(10 * time.Millisecond)
}
log.Info().Msgf("\n-------------------------------------------------------\nDone\n-------------------------------------------------------\n")
diff --git a/plc4go/tests/drivers/tests/eip_driver_test.go
b/plc4go/tests/drivers/tests/eip_driver_test.go
index 5397e786cb..0ff38bf35f 100644
--- a/plc4go/tests/drivers/tests/eip_driver_test.go
+++ b/plc4go/tests/drivers/tests/eip_driver_test.go
@@ -20,25 +20,21 @@
package tests
import (
- "os"
"testing"
"github.com/apache/plc4x/plc4go/internal/eip"
- "github.com/apache/plc4x/plc4go/pkg/api/config"
"github.com/apache/plc4x/plc4go/protocols/eip/readwrite"
"github.com/apache/plc4x/plc4go/spi/testutils"
_ "github.com/apache/plc4x/plc4go/tests/initializetest"
- "github.com/rs/zerolog"
- "github.com/rs/zerolog/log"
)
func TestEIPDriver(t *testing.T) {
- log.Logger = log.
+ /*log.Logger = log.
With().Caller().Logger().
Output(zerolog.ConsoleWriter{Out: os.Stderr}).
Level(zerolog.DebugLevel)
config.TraceTransactionManagerWorkers = true
config.TraceTransactionManagerTransactions = true
- config.TraceDefaultMessageCodecWorker = true
+ config.TraceDefaultMessageCodecWorker = true*/
testutils.RunDriverTestsuite(t, eip.NewDriver(),
"assets/testing/protocols/eip/DriverTestsuite.xml",
readwrite.EipXmlParserHelper{})
}
