faster model test

diff --git a/.gitignore b/.gitignore
index 964f20634b28d59f13fb857d41bd25b128e04034..bcfb59f1bb7b4c7e5358a8fe86e25db938378d67 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -9,8 +9,9 @@ TAGS
 /assets/bld_version.txt
 /options.ini
 /assets/models/gltf/
+/tests/assets/models/gltf/
 /build/
 /dist/
 /assets/locale/
 /assets/images/scenes/
-/uml/*.png
\ No newline at end of file
+/uml/*.png

diff --git a/prj.org b/prj.org
index d9d92377fae488419f7e0f1f3357fc8333f2454c..924def2d316756de6cfb428d3c7dabcbe9e76224 100644 (file)
--- a/prj.org
+++ b/prj.org
@@ -3,11 +3,10 @@
 #+CATEGORY: pmachines
 #+TAGS: bug(b) calendar(c) waiting(w)
 
-* RED do intro video with moviepy
-* READY optimize slow tests
-* BACKLOG implement functional tests with xmlrpc; retrieve the coordinates with rpc
-* BACKLOG functional tests for performance (frame rate)
-* BACKLOG functional tests for "cleaning" i.e. at the end of the states verify:
+* RED implement functional tests with xmlrpc
+* READY retrieve the coordinates of testing elements
+* READY functional tests for performance (frame rate)
+* READY functional tests for "cleaning" i.e. at the end of the states verify:
 - [ ] active threads
 - [ ] active tasks
 - [ ] current nodepaths (render3d)

diff --git a/tests/assets/models/blend/cube/cube.blend b/tests/assets/models/blend/cube/cube.blend
new file mode 100644 (file)
index 0000000..159f71d
Binary files /dev/null and b/tests/assets/models/blend/cube/cube.blend differ

diff --git a/tests/assets/models/blend/cube/diffuse.png b/tests/assets/models/blend/cube/diffuse.png
new file mode 100644 (file)
index 0000000..fc20070
Binary files /dev/null and b/tests/assets/models/blend/cube/diffuse.png differ

diff --git a/tests/ya2/build/test_models.py b/tests/ya2/build/test_models.py
index e569670555e4c7ad2e28c3b0e1e3f3afaa090d73..47c426b4fa946417bc0fbe316950998438c8dad6 100644 (file)
--- a/tests/ya2/build/test_models.py
+++ b/tests/ya2/build/test_models.py
@@ -16,33 +16,36 @@ class ModelsBuilderTests(TestCase):
     def setUp(self):
         self.dirs = ['box', 'domino']
         for fmt_dir in product(['bam', 'gltf'], self.dirs):
-            rmtree('assets/models/%s/%s' % fmt_dir, ignore_errors=True)
+            rmtree('tests/assets/models/%s/%s' % fmt_dir, ignore_errors=True)
 
     def test_models(self):
         if environ.get('FAST') == '1':
             self.skipTest('skipped slow tests')
         for fmt_dir in product(['bam', 'gltf'], self.dirs):
-            self.assertFalse(exists('assets/%s/%s' % fmt_dir))
+            self.assertFalse(exists('tests/assets/%s/%s' % fmt_dir))
         start = time()
-        ModelsBuilder().build('assets/models', 1)
-        self.assertTrue(time() - start > 1.5)
+        ModelsBuilder().build('tests/assets/models', 1)
+        #self.assertTrue(time() - start > 1.5)
         files = [
-            'assets/models/bam/box/box.bam',
-            'assets/models/bam/box/base.dds',
-            'assets/models/bam/box/ao_metal_roughness.dds',
-            'assets/models/bam/box/normal.dds',
-            'assets/models/bam/domino/domino.bam',
-            'assets/models/bam/domino/base.dds',
-            'assets/models/bam/domino/ao_roughness_metal.dds',
-            'assets/models/bam/domino/normal.dds',
-            'assets/models/gltf/box/box.gltf',
-            'assets/models/gltf/box/base.png',
-            'assets/models/gltf/box/ao_metal_roughness.png',
-            'assets/models/gltf/box/normal.png',
-            'assets/models/gltf/domino/domino.gltf',
-            'assets/models/gltf/domino/base.png',
-            'assets/models/gltf/domino/ao_roughness_metal.png',
-            'assets/models/gltf/domino/normal.png']
+            'tests/assets/models/bam/cube/cube.bam',
+            'tests/assets/models/bam/cube/diffuse.dds',
+            # 'assets/models/bam/box/box.bam',
+            # 'assets/models/bam/box/base.dds',
+            # 'assets/models/bam/box/ao_metal_roughness.dds',
+            # 'assets/models/bam/box/normal.dds',
+            # 'assets/models/bam/domino/domino.bam',
+            # 'assets/models/bam/domino/base.dds',
+            # 'assets/models/bam/domino/ao_roughness_metal.dds',
+            # 'assets/models/bam/domino/normal.dds',
+            # 'assets/models/gltf/box/box.gltf',
+            # 'assets/models/gltf/box/base.png',
+            # 'assets/models/gltf/box/ao_metal_roughness.png',
+            # 'assets/models/gltf/box/normal.png',
+            # 'assets/models/gltf/domino/domino.gltf',
+            # 'assets/models/gltf/domino/base.png',
+            # 'assets/models/gltf/domino/ao_roughness_metal.png',
+            # 'assets/models/gltf/domino/normal.png'
+        ]
         [self.assertTrue(exists(fname)) for fname in files]
         #start = time()
         #ModelsBuilder().build('assets/models', 1)