From 3052c7080a5978b78774be1b846d7a881fe3e5f0 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Mon, 14 Aug 2017 14:48:38 -0700 Subject: Added comment just to trigger jenkins --- OpenSim/Tests/Permissions/IndirectTransferTests.cs | 1 + 1 file changed, 1 insertion(+) (limited to 'OpenSim/Tests/Permissions/IndirectTransferTests.cs') diff --git a/OpenSim/Tests/Permissions/IndirectTransferTests.cs b/OpenSim/Tests/Permissions/IndirectTransferTests.cs index 7d8027f..d5a36cc 100644 --- a/OpenSim/Tests/Permissions/IndirectTransferTests.cs +++ b/OpenSim/Tests/Permissions/IndirectTransferTests.cs @@ -74,6 +74,7 @@ namespace OpenSim.Tests.Permissions // Try A2 takes copies of objects that cannot be copied. for (int i = 0; i < 6; i++) TakeOneBox(Common.TheScene.GetSceneObjectGroups(), names[i], perms[i]); + // Ad-hoc. Enough time to let the take work. Thread.Sleep(5000); List items = Common.TheScene.InventoryService.GetFolderItems(Common.TheAvatars[1].UUID, objsFolder.ID); -- cgit v1.1 From af5573728a1c139607fe189d5a532db1e16d0f8b Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Mon, 14 Aug 2017 15:01:19 -0700 Subject: Another comment for testing jenkins --- OpenSim/Tests/Permissions/IndirectTransferTests.cs | 1 + 1 file changed, 1 insertion(+) (limited to 'OpenSim/Tests/Permissions/IndirectTransferTests.cs') diff --git a/OpenSim/Tests/Permissions/IndirectTransferTests.cs b/OpenSim/Tests/Permissions/IndirectTransferTests.cs index d5a36cc..b2c6e76 100644 --- a/OpenSim/Tests/Permissions/IndirectTransferTests.cs +++ b/OpenSim/Tests/Permissions/IndirectTransferTests.cs @@ -87,6 +87,7 @@ namespace OpenSim.Tests.Permissions // Try A2 takes copies of objects that can be copied. for (int i = 0; i < 6; i++) TakeOneBox(Common.TheScene.GetSceneObjectGroups(), names[i], perms[i]); + // Ad-hoc. Enough time to let the take work. Thread.Sleep(5000); items = Common.TheScene.InventoryService.GetFolderItems(Common.TheAvatars[1].UUID, objsFolder.ID); -- cgit v1.1 From 26a4c5ff85562cde2fd84286d3d486f868c8ce55 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Mon, 14 Aug 2017 16:15:08 -0700 Subject: Comment to trigger jenkins --- OpenSim/Tests/Permissions/IndirectTransferTests.cs | 1 + 1 file changed, 1 insertion(+) (limited to 'OpenSim/Tests/Permissions/IndirectTransferTests.cs') diff --git a/OpenSim/Tests/Permissions/IndirectTransferTests.cs b/OpenSim/Tests/Permissions/IndirectTransferTests.cs index b2c6e76..66a228a 100644 --- a/OpenSim/Tests/Permissions/IndirectTransferTests.cs +++ b/OpenSim/Tests/Permissions/IndirectTransferTests.cs @@ -103,6 +103,7 @@ namespace OpenSim.Tests.Permissions private void TakeOneBox(List objs, string name, PermissionMask mask) { + // Find the object inworld SceneObjectGroup box = objs.Find(sog => sog.Name == name && sog.OwnerID == Common.TheAvatars[0].UUID); Assert.That(box, Is.Not.Null, name); -- cgit v1.1 From 40f4b30361d10db4ac35bcec5e172e8f6ae012c4 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Mon, 14 Aug 2017 16:33:21 -0700 Subject: Strengthen the tests for the possibility that SetUpFixture does not run in the beginning. --- OpenSim/Tests/Permissions/IndirectTransferTests.cs | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'OpenSim/Tests/Permissions/IndirectTransferTests.cs') diff --git a/OpenSim/Tests/Permissions/IndirectTransferTests.cs b/OpenSim/Tests/Permissions/IndirectTransferTests.cs index 66a228a..e33332a 100644 --- a/OpenSim/Tests/Permissions/IndirectTransferTests.cs +++ b/OpenSim/Tests/Permissions/IndirectTransferTests.cs @@ -46,6 +46,12 @@ namespace OpenSim.Tests.Permissions [SetUp] public void SetUp() { + // In case we're dealing with some older version of nunit + if (Common.TheInstance == null) + { + Common c = new Common(); + c.SetUp(); + } Common.TheInstance.DeleteObjectsFolders(); } -- cgit v1.1 From 6a0b7a607f13fcee447c9d10224d5ea77db4f355 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Mon, 14 Aug 2017 16:40:36 -0700 Subject: This is the correct work around. Jenkins is confuzzled. --- OpenSim/Tests/Permissions/IndirectTransferTests.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'OpenSim/Tests/Permissions/IndirectTransferTests.cs') diff --git a/OpenSim/Tests/Permissions/IndirectTransferTests.cs b/OpenSim/Tests/Permissions/IndirectTransferTests.cs index e33332a..fb96b8b 100644 --- a/OpenSim/Tests/Permissions/IndirectTransferTests.cs +++ b/OpenSim/Tests/Permissions/IndirectTransferTests.cs @@ -49,8 +49,8 @@ namespace OpenSim.Tests.Permissions // In case we're dealing with some older version of nunit if (Common.TheInstance == null) { - Common c = new Common(); - c.SetUp(); + Common.TheInstance = new Common(); + Common.TheInstance.SetUp(); } Common.TheInstance.DeleteObjectsFolders(); } -- cgit v1.1 From 8b6557e377f7bac1bdb38f3e6dd22c797417d09c Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Mon, 14 Aug 2017 16:49:11 -0700 Subject: Let's try giving Common a default constructor instead of the workaround --- OpenSim/Tests/Permissions/IndirectTransferTests.cs | 6 ------ 1 file changed, 6 deletions(-) (limited to 'OpenSim/Tests/Permissions/IndirectTransferTests.cs') diff --git a/OpenSim/Tests/Permissions/IndirectTransferTests.cs b/OpenSim/Tests/Permissions/IndirectTransferTests.cs index fb96b8b..66a228a 100644 --- a/OpenSim/Tests/Permissions/IndirectTransferTests.cs +++ b/OpenSim/Tests/Permissions/IndirectTransferTests.cs @@ -46,12 +46,6 @@ namespace OpenSim.Tests.Permissions [SetUp] public void SetUp() { - // In case we're dealing with some older version of nunit - if (Common.TheInstance == null) - { - Common.TheInstance = new Common(); - Common.TheInstance.SetUp(); - } Common.TheInstance.DeleteObjectsFolders(); } -- cgit v1.1 From eb837defdf7d9f260603fe400b3a482258605f43 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Mon, 14 Aug 2017 16:55:50 -0700 Subject: Revert "Let's try giving Common a default constructor instead of the workaround" This reverts commit 8b6557e377f7bac1bdb38f3e6dd22c797417d09c. --- OpenSim/Tests/Permissions/IndirectTransferTests.cs | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'OpenSim/Tests/Permissions/IndirectTransferTests.cs') diff --git a/OpenSim/Tests/Permissions/IndirectTransferTests.cs b/OpenSim/Tests/Permissions/IndirectTransferTests.cs index 66a228a..fb96b8b 100644 --- a/OpenSim/Tests/Permissions/IndirectTransferTests.cs +++ b/OpenSim/Tests/Permissions/IndirectTransferTests.cs @@ -46,6 +46,12 @@ namespace OpenSim.Tests.Permissions [SetUp] public void SetUp() { + // In case we're dealing with some older version of nunit + if (Common.TheInstance == null) + { + Common.TheInstance = new Common(); + Common.TheInstance.SetUp(); + } Common.TheInstance.DeleteObjectsFolders(); } -- cgit v1.1