Skip to content

Commit

Permalink
Merge pull request #383 from Unity-Technologies/dev
Browse files Browse the repository at this point in the history
Fix unstable tests (#381)
  • Loading branch information
clusty authored Dec 16, 2020
2 parents 87549b2 + fc0d23b commit 6d02db7
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
1 change: 1 addition & 0 deletions .yamato/upm-ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
editors:
- version: 2019.3
- version: 2019.4
- version: 2020.1
- version: 2020.2
Expand Down
2 changes: 1 addition & 1 deletion com.unity.formats.alembic/Tests/Runtime/BaseFixture.cs
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public void SetUp()
SceneManager.SetActiveScene(scene);
var go = new GameObject("Recorder");
exporter = go.AddComponent<AlembicExporter>();
exporter.MaxCaptureFrame = 10;
exporter.MaxCaptureFrame = 20;
exporter.Recorder.Settings.OutputPath =
"Assets/" + Path.GetFileNameWithoutExtension(Path.GetTempFileName()) + ".abc";
exporter.CaptureOnStart = false;
Expand Down
5 changes: 2 additions & 3 deletions com.unity.formats.alembic/Tests/Runtime/TimelineDataTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ static IEnumerator TestCubeContents(GameObject go)
player.CurrentTime = 0;
yield return new WaitForEndOfFrame();
var t0 = cubeGO.transform.position;
player.CurrentTime = (float)player.Duration;
yield return new WaitForEndOfFrame();
player.UpdateImmediately(player.Duration - 1e-5f);
var t1 = cubeGO.transform.position;
Assert.AreNotEqual(t0, t1);
}
Expand Down Expand Up @@ -210,7 +209,7 @@ public IEnumerator TestTimelineTrack()
var root = PrefabUtility.InstantiatePrefab(go) as GameObject;
var player = root.GetComponent<AlembicStreamPlayer>();
var timeline = director.playableAsset as TimelineAsset;
var abcTrack = timeline.CreateTrack<AlembicTrack>(null,"");
var abcTrack = timeline.CreateTrack<AlembicTrack>(null, "");
var clip = abcTrack.CreateClip<AlembicShotAsset>();
var abcAsset = clip.asset as AlembicShotAsset;
var refAbc = new ExposedReference<AlembicStreamPlayer> {exposedName = Guid.NewGuid().ToString()};
Expand Down

0 comments on commit 6d02db7

Please sign in to comment.