OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

work around some 'tests' errors

LSLKeyTest
UbitUmarov 2015-11-16 18:19:54 +00:00
parent 9b6633697b
commit 554f591eb6
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Data/Tests/RegionTests.cs
View File

@ -39,6 +39,7 @@ using OpenSim.Tests.Common;
using log4net; using log4net;
using System.Reflection; using System.Reflection;
using System.Data.Common; using System.Data.Common;
using System.Threading;
// DBMS-specific: // DBMS-specific:
using MySql.Data.MySqlClient; using MySql.Data.MySqlClient;
@ -259,7 +260,7 @@ namespace OpenSim.Data.Tests
uint localid = localID+1; uint localid = localID+1;
localID = localID + 1; localID = localID + 1;
string name = "Adam West"; string name = "Adam West";
byte material = (byte) random.Next(127); byte material = (byte) random.Next((int)SOPMaterialData.MaxMaterial);
ulong regionh = (ulong)random.NextDouble() * (ulong)random.Next(); ulong regionh = (ulong)random.NextDouble() * (ulong)random.Next();
int pin = random.Next(); int pin = random.Next();
Byte[] partsys = new byte[8]; Byte[] partsys = new byte[8];
@ -433,7 +434,7 @@ namespace OpenSim.Data.Tests
TaskInventoryDictionary dic = new TaskInventoryDictionary(); TaskInventoryDictionary dic = new TaskInventoryDictionary();
localID = localID + 1; localID = localID + 1;
string name = "West Adam"; string name = "West Adam";
byte material = (byte) random.Next(127); byte material = (byte) random.Next((int)SOPMaterialData.MaxMaterial);
ulong regionh = (ulong)random.NextDouble() * (ulong)random.Next(); ulong regionh = (ulong)random.NextDouble() * (ulong)random.Next();
int pin = random.Next(); int pin = random.Next();
Byte[] partsys = new byte[8]; Byte[] partsys = new byte[8];
@ -960,6 +961,9 @@ namespace OpenSim.Data.Tests
double[,] t1 = GenTerrain(height1); double[,] t1 = GenTerrain(height1);
db.StoreTerrain(t1, region1); db.StoreTerrain(t1, region1);
// store terrain is async
Thread.Sleep(1000);
Assert.That(db.LoadTerrain(zero), Is.Null); Assert.That(db.LoadTerrain(zero), Is.Null);
Assert.That(db.LoadTerrain(region1), Is.Not.Null); Assert.That(db.LoadTerrain(region1), Is.Not.Null);
Assert.That(db.LoadTerrain(region2), Is.Null); Assert.That(db.LoadTerrain(region2), Is.Null);
@ -987,6 +991,9 @@ namespace OpenSim.Data.Tests
double[,] baseterrain2 = GenTerrain(height2); double[,] baseterrain2 = GenTerrain(height2);
db.StoreTerrain(baseterrain2, region1); db.StoreTerrain(baseterrain2, region1);
// store terrain is async
Thread.Sleep(1000);
double[,] t1 = db.LoadTerrain(region1); double[,] t1 = db.LoadTerrain(region1);
Assert.That(CompareTerrain(t1, baseterrain1), Is.False); Assert.That(CompareTerrain(t1, baseterrain1), Is.False);
Assert.That(CompareTerrain(t1, baseterrain2), Is.True); Assert.That(CompareTerrain(t1, baseterrain2), Is.True);