diff options
author | UbitUmarov | 2016-09-01 12:45:09 +0100 |
---|---|---|
committer | UbitUmarov | 2016-09-01 12:45:09 +0100 |
commit | 924aaedfcef5a0a209c8b7579ca0a77ace3102d4 (patch) | |
tree | 317472a76bf478fee36db9649485035af71c3dbb /OpenSim/Data/Tests/AssetTests.cs | |
parent | Xengine: and fix line count again (diff) | |
download | opensim-SC_OLD-924aaedfcef5a0a209c8b7579ca0a77ace3102d4.zip opensim-SC_OLD-924aaedfcef5a0a209c8b7579ca0a77ace3102d4.tar.gz opensim-SC_OLD-924aaedfcef5a0a209c8b7579ca0a77ace3102d4.tar.bz2 opensim-SC_OLD-924aaedfcef5a0a209c8b7579ca0a77ace3102d4.tar.xz |
assets uploads to grid. Change the retry code. Stop using asset.UploadAttempts field that should be removed
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/Tests/AssetTests.cs | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/OpenSim/Data/Tests/AssetTests.cs b/OpenSim/Data/Tests/AssetTests.cs index 5982a09..5d7b169 100644 --- a/OpenSim/Data/Tests/AssetTests.cs +++ b/OpenSim/Data/Tests/AssetTests.cs | |||
@@ -125,20 +125,14 @@ namespace OpenSim.Data.Tests | |||
125 | m_db.StoreAsset(a1); | 125 | m_db.StoreAsset(a1); |
126 | m_db.StoreAsset(a2); | 126 | m_db.StoreAsset(a2); |
127 | m_db.StoreAsset(a3); | 127 | m_db.StoreAsset(a3); |
128 | a1.UploadAttempts = 0; | ||
129 | a2.UploadAttempts = 0; | ||
130 | a3.UploadAttempts = 0; | ||
131 | 128 | ||
132 | AssetBase a1a = m_db.GetAsset(uuid1); | 129 | AssetBase a1a = m_db.GetAsset(uuid1); |
133 | a1a.UploadAttempts = 0; | ||
134 | Assert.That(a1a, Constraints.PropertyCompareConstraint(a1)); | 130 | Assert.That(a1a, Constraints.PropertyCompareConstraint(a1)); |
135 | 131 | ||
136 | AssetBase a2a = m_db.GetAsset(uuid2); | 132 | AssetBase a2a = m_db.GetAsset(uuid2); |
137 | a2a.UploadAttempts = 0; | ||
138 | Assert.That(a2a, Constraints.PropertyCompareConstraint(a2)); | 133 | Assert.That(a2a, Constraints.PropertyCompareConstraint(a2)); |
139 | 134 | ||
140 | AssetBase a3a = m_db.GetAsset(uuid3); | 135 | AssetBase a3a = m_db.GetAsset(uuid3); |
141 | a3a.UploadAttempts = 0; | ||
142 | Assert.That(a3a, Constraints.PropertyCompareConstraint(a3)); | 136 | Assert.That(a3a, Constraints.PropertyCompareConstraint(a3)); |
143 | 137 | ||
144 | scrambler.Scramble(a1a); | 138 | scrambler.Scramble(a1a); |
@@ -148,20 +142,14 @@ namespace OpenSim.Data.Tests | |||
148 | m_db.StoreAsset(a1a); | 142 | m_db.StoreAsset(a1a); |
149 | m_db.StoreAsset(a2a); | 143 | m_db.StoreAsset(a2a); |
150 | m_db.StoreAsset(a3a); | 144 | m_db.StoreAsset(a3a); |
151 | a1a.UploadAttempts = 0; | ||
152 | a2a.UploadAttempts = 0; | ||
153 | a3a.UploadAttempts = 0; | ||
154 | 145 | ||
155 | AssetBase a1b = m_db.GetAsset(uuid1); | 146 | AssetBase a1b = m_db.GetAsset(uuid1); |
156 | a1b.UploadAttempts = 0; | ||
157 | Assert.That(a1b, Constraints.PropertyCompareConstraint(a1a)); | 147 | Assert.That(a1b, Constraints.PropertyCompareConstraint(a1a)); |
158 | 148 | ||
159 | AssetBase a2b = m_db.GetAsset(uuid2); | 149 | AssetBase a2b = m_db.GetAsset(uuid2); |
160 | a2b.UploadAttempts = 0; | ||
161 | Assert.That(a2b, Constraints.PropertyCompareConstraint(a2a)); | 150 | Assert.That(a2b, Constraints.PropertyCompareConstraint(a2a)); |
162 | 151 | ||
163 | AssetBase a3b = m_db.GetAsset(uuid3); | 152 | AssetBase a3b = m_db.GetAsset(uuid3); |
164 | a3b.UploadAttempts = 0; | ||
165 | Assert.That(a3b, Constraints.PropertyCompareConstraint(a3a)); | 153 | Assert.That(a3b, Constraints.PropertyCompareConstraint(a3a)); |
166 | 154 | ||
167 | bool[] exist = m_db.AssetsExist(new[] { uuid1, uuid2, uuid3 }); | 155 | bool[] exist = m_db.AssetsExist(new[] { uuid1, uuid2, uuid3 }); |
@@ -202,22 +190,16 @@ namespace OpenSim.Data.Tests | |||
202 | a3.Data = data1; | 190 | a3.Data = data1; |
203 | 191 | ||
204 | m_db.StoreAsset(a1); | 192 | m_db.StoreAsset(a1); |
205 | a1.UploadAttempts = 0; | ||
206 | m_db.StoreAsset(a2); | 193 | m_db.StoreAsset(a2); |
207 | a2.UploadAttempts = 0; | ||
208 | m_db.StoreAsset(a3); | 194 | m_db.StoreAsset(a3); |
209 | a3.UploadAttempts = 0; | ||
210 | 195 | ||
211 | AssetBase a1a = m_db.GetAsset(uuid1); | 196 | AssetBase a1a = m_db.GetAsset(uuid1); |
212 | a1a.UploadAttempts = 0; | ||
213 | Assert.That(a1a, Constraints.PropertyCompareConstraint(a1)); | 197 | Assert.That(a1a, Constraints.PropertyCompareConstraint(a1)); |
214 | 198 | ||
215 | AssetBase a2a = m_db.GetAsset(uuid2); | 199 | AssetBase a2a = m_db.GetAsset(uuid2); |
216 | a2a.UploadAttempts = 0; | ||
217 | Assert.That(a2a, Constraints.PropertyCompareConstraint(a2)); | 200 | Assert.That(a2a, Constraints.PropertyCompareConstraint(a2)); |
218 | 201 | ||
219 | AssetBase a3a = m_db.GetAsset(uuid3); | 202 | AssetBase a3a = m_db.GetAsset(uuid3); |
220 | a3a.UploadAttempts = 0; | ||
221 | Assert.That(a3a, Constraints.PropertyCompareConstraint(a3)); | 203 | Assert.That(a3a, Constraints.PropertyCompareConstraint(a3)); |
222 | } | 204 | } |
223 | } | 205 | } |